From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 10 Jan 2014 16:17:44 +0000 (-0500)
Subject: GApplication: allow handles_commandline and service
X-Git-Tag: 2.39.3~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3017967d8123e800fd593e22fda1c0d7f40071f;p=platform%2Fupstream%2Fglib.git

GApplication: allow handles_commandline and service

The default local_command_line handler has a fast return path for the
case that we handle the commandline by forwarding it to the primary
instance, but this doesn't account for the fact that we may want to
become a service.

Allow for this by making sure we don't take the fast path of the service
flag is set.
---

diff --git a/gio/gapplication.c b/gio/gapplication.c
index 722e1ab..2024048 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -494,7 +494,8 @@ g_application_real_local_command_line (GApplication   *application,
         }
     }
 
-  if (application->priv->flags & G_APPLICATION_HANDLES_COMMAND_LINE)
+  if ((application->priv->flags & G_APPLICATION_HANDLES_COMMAND_LINE) &&
+      !(application->priv->flags & G_APPLICATION_IS_SERVICE))
     return FALSE;
 
   else