luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-19 23:28:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-tool: Factor out common GOptionContext construction

Browse Source 
In doing so, ensure that g_option_context_set_ignore_unknown_options()
is always called if completion is being done.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=793597
This commit is contained in:
Philip Withnall
2018-02-21 14:20:59 +00:00
parent e2d9884958
commit 0cf523e791
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
gio/gdbus-tool.c
View File

@@ -134,6 +134,24 @@ modify_argv0_for_command (gint *argc, gchar **argv[], const gchar *command)
g_free (program_name); g_free (program_name);
} }
static GOptionContext *
command_option_context_new (const gchar *parameter_string,
const gchar *summary,
const GOptionEntry *entries,
gboolean request_completion)
{
GOptionContext *o = NULL;
o = g_option_context_new (parameter_string);
if (request_completion)
g_option_context_set_ignore_unknown_options (o, TRUE);
g_option_context_set_help_enabled (o, FALSE);
g_option_context_set_summary (o, summary);
g_option_context_add_main_entries (o, entries, GETTEXT_PACKAGE);
return g_steal_pointer (&o);
}
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
static void static void
@@ -582,12 +600,8 @@ handle_emit (gint *argc,
modify_argv0_for_command (argc, argv, "emit"); modify_argv0_for_command (argc, argv, "emit");
o = g_option_context_new (NULL); o = command_option_context_new (NULL, _("Emit a signal."),
if (request_completion) emit_entries, request_completion);
g_option_context_set_ignore_unknown_options (o, TRUE);
g_option_context_set_help_enabled (o, FALSE);
g_option_context_set_summary (o, _("Emit a signal."));
g_option_context_add_main_entries (o, emit_entries, GETTEXT_PACKAGE);
g_option_context_add_group (o, connection_get_group ()); g_option_context_add_group (o, connection_get_group ());
complete_names = FALSE; complete_names = FALSE;
@@ -893,10 +907,8 @@ handle_call (gint *argc,
modify_argv0_for_command (argc, argv, "call"); modify_argv0_for_command (argc, argv, "call");
o = g_option_context_new (NULL); o = command_option_context_new (NULL, _("Invoke a method on a remote object."),
g_option_context_set_help_enabled (o, FALSE); call_entries, request_completion);
g_option_context_set_summary (o, _("Invoke a method on a remote object."));
g_option_context_add_main_entries (o, call_entries, GETTEXT_PACKAGE);
g_option_context_add_group (o, connection_get_group ()); g_option_context_add_group (o, connection_get_group ());
complete_names = FALSE; complete_names = FALSE;
@@ -1652,12 +1664,8 @@ handle_introspect (gint *argc,
modify_argv0_for_command (argc, argv, "introspect"); modify_argv0_for_command (argc, argv, "introspect");
o = g_option_context_new (NULL); o = command_option_context_new (NULL, _("Introspect a remote object."),
if (request_completion) introspect_entries, request_completion);
g_option_context_set_ignore_unknown_options (o, TRUE);
g_option_context_set_help_enabled (o, FALSE);
g_option_context_set_summary (o, _("Introspect a remote object."));
g_option_context_add_main_entries (o, introspect_entries, GETTEXT_PACKAGE);
g_option_context_add_group (o, connection_get_group ()); g_option_context_add_group (o, connection_get_group ());
complete_names = FALSE; complete_names = FALSE;
@@ -1885,12 +1893,8 @@ handle_monitor (gint *argc,
modify_argv0_for_command (argc, argv, "monitor"); modify_argv0_for_command (argc, argv, "monitor");
o = g_option_context_new (NULL); o = command_option_context_new (NULL, _("Monitor a remote object."),
if (request_completion) monitor_entries, request_completion);
g_option_context_set_ignore_unknown_options (o, TRUE);
g_option_context_set_help_enabled (o, FALSE);
g_option_context_set_summary (o, _("Monitor a remote object."));
g_option_context_add_main_entries (o, monitor_entries, GETTEXT_PACKAGE);
g_option_context_add_group (o, connection_get_group ()); g_option_context_add_group (o, connection_get_group ());
complete_names = FALSE; complete_names = FALSE;
@@ -2122,10 +2126,9 @@ handle_wait (gint *argc,
modify_argv0_for_command (argc, argv, "wait"); modify_argv0_for_command (argc, argv, "wait");
o = g_option_context_new (_("[OPTION…] BUS-NAME")); o = command_option_context_new (_("[OPTION…] BUS-NAME"),
g_option_context_set_help_enabled (o, FALSE); _("Wait for a bus name to appear."),
g_option_context_set_summary (o, _("Wait for a bus name to appear.")); wait_entries, request_completion);
g_option_context_add_main_entries (o, wait_entries, GETTEXT_PACKAGE);
g_option_context_add_group (o, connection_get_group ()); g_option_context_add_group (o, connection_get_group ());
if (!g_option_context_parse (o, argc, argv, NULL)) if (!g_option_context_parse (o, argc, argv, NULL))