mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
GApplication: ignore --help if not handling args
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:
parent
817f82da6c
commit
f4af8d1d00
@ -498,9 +498,15 @@ g_application_parse_command_line (GApplication *application,
|
||||
* G_APPLICATION_HANDLES_COMMAND_LINE then we have to assume that
|
||||
* their primary instance commandline handler may want to deal with
|
||||
* 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))
|
||||
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
|
||||
* launcher then we want to add the "--gapplication-service" option to
|
||||
|
Loading…
Reference in New Issue
Block a user