*/
#include "config.h"
-
-#include <string.h>
+#include "empathy-individual-view.h"
#include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-view.h"
-#include "empathy-individual-menu.h"
-#include "empathy-individual-store.h"
-#include "empathy-individual-edit-dialog.h"
-#include "empathy-individual-dialogs.h"
-#include "empathy-images.h"
+#include "empathy-cell-renderer-activatable.h"
#include "empathy-cell-renderer-expander.h"
#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-contact-groups.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-images.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
shell = GTK_MENU_SHELL (menu);
/* audio */
- item = empathy_individual_audio_call_menu_item_new (individual);
+ item = empathy_individual_audio_call_menu_item_new (NULL, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* video */
- item = empathy_individual_video_call_menu_item_new (individual);
+ item = empathy_individual_video_call_menu_item_new (NULL, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
- pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
+ pixbuf = tpaw_pixbuf_from_icon_name ("emblem-favorite",
GTK_ICON_SIZE_MENU);
}
else if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY))
{
- pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp",
+ pixbuf = tpaw_pixbuf_from_icon_name ("im-local-xmpp",
GTK_ICON_SIZE_MENU);
}
}
static void
-individual_view_search_text_notify_cb (EmpathyLiveSearch *search,
+individual_view_search_text_notify_cb (TpawLiveSearch *search,
GParamSpec *pspec,
EmpathyIndividualView *view)
{
}
static void
-individual_view_search_hide_cb (EmpathyLiveSearch *search,
+individual_view_search_hide_cb (TpawLiveSearch *search,
EmpathyIndividualView *view)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);
}
static void
-individual_view_search_show_cb (EmpathyLiveSearch *search,
+individual_view_search_show_cb (TpawLiveSearch *search,
EmpathyIndividualView *view)
{
/* block expand or collapse handlers during expand all, they would
EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name,
-1);
- if (!is_group || EMP_STR_EMPTY (name))
+ if (!is_group || TPAW_STR_EMPTY (name))
{
g_free (name);
return;
guint event_count)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (self);
- EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
+ TpawLiveSearch *live = TPAW_LIVE_SEARCH (priv->search_widget);
GeeSet *personas;
GeeIterator *iter;
gboolean is_favorite;
}
return empathy_individual_match_string (individual,
- empathy_live_search_get_text (live),
- empathy_live_search_get_words (live));
+ tpaw_live_search_get_text (live),
+ tpaw_live_search_get_words (live));
}
static gchar *
text =
g_strdup_printf (_("Do you really want to remove the group '%s'?"),
group);
- parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+ parent = tpaw_get_toplevel_window (GTK_WIDGET (view));
if (individual_view_remove_dialog_show (parent, _("Removing group"),
text) == REMOVE_DIALOG_RESPONSE_DELETE)
{
if (!empathy_folks_individual_contains_contact (individual))
goto out;
- menu = empathy_individual_menu_new (individual, priv->individual_features,
- priv->store);
+ menu = empathy_individual_menu_new (individual, NULL,
+ priv->individual_features, priv->store);
out:
g_object_unref (individual);
void
empathy_individual_view_set_live_search (EmpathyIndividualView *view,
- EmpathyLiveSearch *search)
+ TpawLiveSearch *search)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);