[empathy] Properly handle remote instances of the accounts dialog.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Properly handle remote instances of the accounts dialog.
- Date: Fri, 29 Oct 2010 16:35:49 +0000 (UTC)
commit f6e6e24cd11b820e382e687626b52dd3eb6364a7
Author: Travis Reitter <travis reitter collabora co uk>
Date: Fri Oct 22 12:35:50 2010 -0700
Properly handle remote instances of the accounts dialog.
Helps bgo#632912.
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 31f555f..664f6f3 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]