diff options
author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-23 02:41:47 +0800 |
---|---|---|
committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-30 00:35:09 +0800 |
commit | f0bc602802fd56095886b1d6b1b054a44320973d (patch) | |
tree | 789d941f6adf019a113bc494a5707248a1306f94 /src | |
parent | 8b529506fbc4265b44ab35cda5bdc99978192680 (diff) | |
download | gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar.gz gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar.bz2 gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar.lz gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar.xz gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.tar.zst gsoc2013-empathy-f0bc602802fd56095886b1d6b1b054a44320973d.zip |
Make the Empathy core program act as a unique app.
This means that instances beyond the first simply raise the initial instance and
exit.
Helps bgo#632912.
Diffstat (limited to 'src')
-rw-r--r-- | src/empathy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy.c b/src/empathy.c index 6e47af2de..1081fd1b7 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -189,7 +189,6 @@ empathy_app_new (guint argc, self = g_object_new (EMPATHY_TYPE_APP, "application-id", EMPATHY_DBUS_NAME, - "flags", G_APPLICATION_IS_SERVICE, NULL); if (self == NULL) @@ -233,6 +232,8 @@ empathy_app_activate (GApplication *app) */ self->start_hidden = FALSE; + g_application_hold (G_APPLICATION (app)); + empathy_window_present (GTK_WINDOW (self->window)); /* Display the accounts dialog if needed */ @@ -685,7 +686,6 @@ main (int argc, char *argv[]) app = empathy_app_new (argc, (const gchar * const *) argv, no_connect, start_hidden); - g_application_hold (G_APPLICATION (app)); g_application_run (G_APPLICATION (app), argc, argv); notify_uninit (); |