diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-01-10 11:17:44 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-01-10 11:17:44 -0500 |
| commit | d3017967d8123e800fd593e22fda1c0d7f40071f (patch) | |
| tree | 191c482e67eeafac65b3052e50b571267e13d0a4 /gio/gapplication.c | |
| parent | e8b7dd32fcfb4be82d3d78561fc36fbc560f3394 (diff) | |
| download | glib-d3017967d8123e800fd593e22fda1c0d7f40071f.tar.gz | |
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.
Diffstat (limited to 'gio/gapplication.c')
| -rw-r--r-- | gio/gapplication.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gio/gapplication.c b/gio/gapplication.c index 722e1ab9d..20240481c 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 |