Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[empathy.git] / src / empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index 6e8a3327ec68d9b86b8a79239e5765abc6010e5f..f59a54f17f7c559ec41512f87077c5a5b95e5ee4 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -65,7 +65,7 @@
 #include <libempathy-gtk/empathy-location-manager.h>
 #include <libempathy-gtk/empathy-notify-manager.h>
 
-#include "empathy-main-window.h"
+#include "empathy-roster-window.h"
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-status-icon.h"
@@ -289,8 +289,8 @@ out:
       /* Rely on GNOME Shell to watch session state */
       empathy_presence_manager_set_auto_away (self->presence_mgr, FALSE);
 
-      empathy_main_window_set_shell_running (EMPATHY_MAIN_WINDOW (self->window),
-                                             TRUE);
+      empathy_roster_window_set_shell_running (
+          EMPATHY_ROSTER_WINDOW (self->window), TRUE);
     }
   else
     {
@@ -355,7 +355,7 @@ empathy_app_command_line (GApplication *app,
       self->activated = TRUE;
 
       /* Setting up UI */
-      self->window = empathy_main_window_dup ();
+      self->window = empathy_roster_window_dup ();
 
       gtk_application_add_window (GTK_APPLICATION (app),
           GTK_WINDOW (self->window));
@@ -381,8 +381,8 @@ empathy_app_command_line (GApplication *app,
     }
 
   if (self->show_preferences)
-    empathy_main_window_show_preferences (EMPATHY_MAIN_WINDOW (self->window),
-        self->preferences_tab);
+    empathy_roster_window_show_preferences (
+        EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab);
 
   if (!self->start_hidden)
     empathy_window_present (GTK_WINDOW (self->window));
@@ -832,6 +832,8 @@ add_empathy_features (void)
       /* empathy_connection_aggregator_get_all_groups(), used by
        * EmpathyGroupsWidget relies on it */
       TP_CONNECTION_FEATURE_CONTACT_GROUPS,
+      /* empathy_connection_aggregator_dup_all_contacts(), used by
+       * EmpathyEventManager relies on it */
       TP_CONNECTION_FEATURE_CONTACT_LIST,
       NULL);