luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: ignore --help if not handling args

Browse Source 
If the user didn't register any arguments for parsing, also ignore
--help.  This fixes a regression in meld.

https://bugzilla.gnome.org/show_bug.cgi?id=737869
This commit is contained in:
Ryan Lortie 2014-10-04 12:47:33 -04:00
parent 817f82da6c
commit f4af8d1d00
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gapplication.c
View File

@ -498,9 +498,15 @@ g_application_parse_command_line (GApplication *application,
* G_APPLICATION_HANDLES_COMMAND_LINE then we have to assume that * G_APPLICATION_HANDLES_COMMAND_LINE then we have to assume that
* their primary instance commandline handler may want to deal with * their primary instance commandline handler may want to deal with
* the arguments. We must therefore ignore them. * the arguments. We must therefore ignore them.
*
* We must also ignore --help in this case since some applications
* will try to handle this from the remote side. See #737869.
*/ */
if (application->priv->main_options == NULL && (application->priv->flags & G_APPLICATION_HANDLES_COMMAND_LINE)) if (application->priv->main_options == NULL && (application->priv->flags & G_APPLICATION_HANDLES_COMMAND_LINE))
{
g_option_context_set_ignore_unknown_options (context, TRUE); g_option_context_set_ignore_unknown_options (context, TRUE);
g_option_context_set_help_enabled (context, FALSE);
}
/* In the case that we are not explicitly marked as a service or a /* In the case that we are not explicitly marked as a service or a
* launcher then we want to add the "--gapplication-service" option to * launcher then we want to add the "--gapplication-service" option to