[empathy/gnome-2-28] When starting hidden don't show the assistant

[Sjoerd Simons <sjoerds src gnome org>]

commit 6248651c2f485427863a2e59278ff842e843cf94
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Oct 13 19:38:21 2009 -0400

    When starting hidden don't show the assistant

 src/empathy.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index 8c3a5ce..958646f 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -81,6 +81,8 @@
 
 #define COMMAND_ACCOUNTS_DIALOG 1
 
+static gboolean start_hidden = FALSE;
+
 static void
 dispatch_cb (EmpathyDispatcher *dispatcher,
     EmpathyDispatchOperation *operation,
@@ -571,7 +573,7 @@ account_manager_ready_cb (EmpathyAccountManager *manager,
             G_CALLBACK (connection_managers_ready_cb), NULL);
         }
     }
-  else
+  else if (!start_hidden)
     {
       maybe_show_account_assistant ();
     }
@@ -747,7 +749,6 @@ main (int argc, char *argv[])
   EmpathyConnectivity *connectivity;
   gboolean autoconnect = TRUE;
   gboolean no_connect = FALSE;
-  gboolean hide_contact_list = FALSE;
   gboolean accounts_dialog = FALSE;
   GError *error = NULL;
   TpDBusDaemon *dbus_daemon;
@@ -761,7 +762,7 @@ main (int argc, char *argv[])
         N_("Don't connect on startup"),
         NULL },
       { "hide-contact-list", 'h',
-        0, G_OPTION_ARG_NONE, &hide_contact_list,
+        0, G_OPTION_ARG_NONE, &start_hidden,
         N_("Don't show the contact list on startup"),
         NULL },
       { "accounts", 'a',
@@ -887,7 +888,7 @@ main (int argc, char *argv[])
 
   /* Setting up UI */
   window = empathy_main_window_show ();
-  icon = empathy_status_icon_new (GTK_WINDOW (window), hide_contact_list);
+  icon = empathy_status_icon_new (GTK_WINDOW (window), start_hidden);
 
   g_signal_connect (unique_app, "message-received",
       G_CALLBACK (unique_app_message_cb), window);