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.

diff --git a/src/empathy.c b/src/empathy.c
index 6e47af2dee0ee09e197addc1a34921dcac8d59d3..1081fd1b74ceb44fe8be2f1ebfce76d3872bece5 100644 (file)
--- 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 ();