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 90370e6211c5e66107f53ab86cd501ab7df68b65..c36f2a2d747b80dccb3360d64f57f874c9154491 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -354,11 +354,17 @@ empathy_app_command_line (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,