aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-16 18:41:15 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-07-16 19:41:49 +0800
commit1c95c220ca3830e83ed436d840528126e9ba9d15 (patch)
tree9c4547d8d001da9995143f773f10bbc53846576a /src/empathy.c
parent7cded0b0190dac119d3e7bb6882b2a2a93293db8 (diff)
downloadgsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar.gz
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar.bz2
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar.lz
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar.xz
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.tar.zst
gsoc2013-empathy-1c95c220ca3830e83ed436d840528126e9ba9d15.zip
Move the responsibility of popping up the empathy accounts dialog out of the status icon
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 5e3d983aa..1fa7f5a12 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -453,6 +453,22 @@ default_log_handler (const gchar *log_domain,
}
#endif /* ENABLE_DEBUG */
+static void
+account_manager_ready_cb (EmpathyAccountManager *manager,
+ GParamSpec *spec,
+ gpointer user_data)
+{
+ if (!empathy_account_manager_is_ready (manager))
+ return;
+
+ if (empathy_account_manager_get_count (manager) != 0)
+ {
+ empathy_accounts_dialog_show (GTK_WINDOW (empathy_main_window_get ()),
+ NULL);
+ }
+ create_salut_account ();
+}
+
int
main (int argc, char *argv[])
{
@@ -605,8 +621,8 @@ main (int argc, char *argv[])
/* account management */
account_manager = empathy_account_manager_dup_singleton ();
-
- create_salut_account ();
+ g_signal_connect (account_manager, "notify::ready",
+ G_CALLBACK (account_manager_ready_cb), NULL);
/* Setting up UI */
window = empathy_main_window_show ();
@@ -666,4 +682,3 @@ main (int argc, char *argv[])
return EXIT_SUCCESS;
}
-