diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-23 03:35:50 +0800 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-30 00:35:09 +0800 |
| commit | f6e6e24cd11b820e382e687626b52dd3eb6364a7 (patch) | |
| tree | 576e875702a52b112daafdb13f6a4fda369f52c5 /src | |
| parent | f9e4c3d37f6cc259beca5b4dde709a34e517d2c6 (diff) | |
| download | gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar.gz gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar.bz2 gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar.lz gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar.xz gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.tar.zst gsoc2013-empathy-f6e6e24cd11b820e382e687626b52dd3eb6364a7.zip | |
Properly handle remote instances of the accounts dialog.
Helps bgo#632912.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 31f555f1b..664f6f38b 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -139,6 +139,9 @@ app_activate_cb (GApplication *app) { TpAccountManager *account_manager; + /* don't let this application exit automatically */ + g_application_hold (G_APPLICATION (app)); + account_manager = tp_account_manager_dup (); empathy_accounts_show_accounts_ui (account_manager, NULL, @@ -200,7 +203,7 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, - G_APPLICATION_IS_SERVICE); + G_APPLICATION_FLAGS_NONE); account_manager = tp_account_manager_dup (); @@ -209,8 +212,6 @@ main (int argc, char *argv[]) g_signal_connect (app, "activate", G_CALLBACK (app_activate_cb), NULL); - /* don't let this application exit automatically */ - g_application_hold (G_APPLICATION (app)); g_application_run (G_APPLICATION (app), argc, argv); g_object_unref (account_manager); |