GApplication: add G_APPLICATION_NON_UNIQUE

[platform/upstream/glib.git] / gio / gapplication.c

diff --git a/gio/gapplication.c b/gio/gapplication.c
index 7a97fef..c37c3db 100644 (file)
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -1006,14 +1006,17 @@ g_application_register (GApplication  *application,
 
   if (!application->priv->is_registered)
     {
-      application->priv->impl =
-        g_application_impl_register (application, application->priv->id,
-                                     application->priv->flags,
-                                     &application->priv->remote_actions,
-                                     cancellable, error);
-
-      if (application->priv->impl == NULL)
-        return FALSE;
+      if (~application->priv->flags & G_APPLICATION_NON_UNIQUE)
+        {
+          application->priv->impl =
+            g_application_impl_register (application, application->priv->id,
+                                         application->priv->flags,
+                                         &application->priv->remote_actions,
+                                         cancellable, error);
+
+          if (application->priv->impl == NULL)
+            return FALSE;
+        }
 
       application->priv->is_remote = application->priv->remote_actions != NULL;
       application->priv->is_registered = TRUE;