[glib] GApplication: allow handles_commandline and service

[Ryan Lortie <desrt src gnome org>]

commit d3017967d8123e800fd593e22fda1c0d7f40071f
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jan 10 11:17:44 2014 -0500

    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.

 gio/gapplication.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
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