EmpathyApp: don't open the main instance if only the preferences are requested

Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=697254

diff --git a/src/empathy.c b/src/empathy.c
index d5149a3d2e2f954cda0a266e93707b5251fc6130..a716afbd8023a775989a967f32f7202274b13483 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -332,11 +332,17 @@ empathy_app_activate (GApplication *app)
     }
 
   if (self->show_preferences)
-    empathy_roster_window_show_preferences (
-        EMPATHY_ROSTER_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));
+      self->show_preferences = FALSE;
+    }
+  else
+    {
+      if (!self->start_hidden)
+        empathy_window_present (GTK_WINDOW (self->window));
+    }
 
   /* Display the accounts dialog if needed */
   tp_proxy_prepare_async (self->account_manager, NULL,