[empathy/gnome-3-8] EmpathyApp: don't open the main instance if only the preferences are requested

[Marco Trevisan <marcotrevi src gnome org>]

commit e1e7dde31143a916e804980bb5baf0d32060ad8d
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Thu Apr 4 17:55:32 2013 +0200

    EmpathyApp: don't open the main instance if only the preferences are requested
    
    Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=697254

 src/empathy.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index 90370e6..c36f2a2 100644
--- 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,