roster-view: inherit from GtkListBox

[empathy.git] / tests / interactive / test-empathy-roster-view.c

diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 0c95c445b1d2807d2d5fe2635b42debec659c080..fbf09c71d556158a537fa9c33f7746303cd877db 100644 (file)
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,10 +1,9 @@
-#include <config.h>
+#include "config.h"
 
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;
@@ -29,6 +28,7 @@ individual_activated_cb (EmpathyRosterView *self,
 
 static void
 popup_individual_menu_cb (EmpathyRosterView *self,
+    const gchar *group,
     FolksIndividual *individual,
     guint button,
     guint time,
@@ -36,8 +36,8 @@ popup_individual_menu_cb (EmpathyRosterView *self,
 {
   GtkWidget *menu, *item;
 
-  g_print ("'%s' popup menu\n",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
+  g_print ("'%s' (group: %s) popup menu\n",
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), group);
 
   menu = gtk_menu_new ();
 
@@ -129,16 +129,15 @@ main (int argc,
 
   g_object_unref (mgr);
 
-  search = empathy_live_search_new (view);
+  search = tpaw_live_search_new (view);
   empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view),
-      EMPATHY_LIVE_SEARCH (search));
+      TPAW_LIVE_SEARCH (search));
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
-  egg_list_box_add_to_scrolled (EGG_LIST_BOX (view),
-      GTK_SCROLLED_WINDOW (scrolled));
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
 
   gtk_box_pack_start (GTK_BOX (box), search, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), scrolled, TRUE, TRUE, 0);