luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: allow handles_commandline and service

Browse Source 
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.
This commit is contained in:
Ryan Lortie 2014-01-10 11:17:44 -05:00
parent e8b7dd32fc
commit d3017967d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gapplication.c
View File

@ -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