aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-10-14 07:38:21 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-10-15 01:26:03 +0800
commit4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd (patch)
tree390f174a94c0199c827a2b88193ae004d9703d01 /src
parente288bb38a4f04cf4ce00e77b5b81937eda2f0a12 (diff)
downloadgsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar.gz
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar.bz2
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar.lz
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar.xz
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.tar.zst
gsoc2013-empathy-4dce4c7c7f6282d06aceef5d63d3e653ac3b24cd.zip
When starting hidden don't show the assistant
Diffstat (limited to 'src')
-rw-r--r--src/empathy.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 9152b643d..ae03dcb18 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,
@@ -562,7 +564,7 @@ account_manager_ready_cb (EmpathyAccountManager *manager,
G_CALLBACK (connection_managers_ready_cb), NULL);
}
}
- else
+ else if (!start_hidden)
{
maybe_show_account_assistant ();
}
@@ -759,7 +761,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;
@@ -773,7 +774,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',
@@ -899,7 +900,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);