[gnome-control-center/gnome-3-0] shell: Make --help-all and --help-gtk work
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-0] shell: Make --help-all and --help-gtk work
- Date: Fri, 10 Jun 2011 16:24:43 +0000 (UTC)
commit b62284f693256674cfa8782317d7edc0da119aa4
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jun 10 17:23:23 2011 +0100
shell: Make --help-all and --help-gtk work
https://bugzilla.gnome.org/show_bug.cgi?id=652165
shell/control-center.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/shell/control-center.c b/shell/control-center.c
index f4d4c8a..9370aa5 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -45,12 +45,16 @@ static char **start_panels = NULL;
static gboolean show_overview = FALSE;
static gboolean verbose = FALSE;
static gboolean show_help = FALSE;
+static gboolean show_help_gtk = FALSE;
+static gboolean show_help_all = FALSE;
const GOptionEntry all_options[] = {
{ "version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL },
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, N_("Enable verbose mode"), NULL },
{ "overview", 'o', 0, G_OPTION_ARG_NONE, &show_overview, N_("Show the overview"), NULL },
- { "help", '?', 0, G_OPTION_ARG_NONE, &show_help, N_("Show help options"), NULL },
+ { "help", 'h', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_help, N_("Show help options"), NULL },
+ { "help-all", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_help_all, N_("Show help options"), NULL },
+ { "help-gtk", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_help_gtk, N_("Show help options"), NULL },
{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &start_panels, N_("Panel to display"), NULL },
{ NULL } /* end the list */
};
@@ -88,11 +92,17 @@ application_command_line_cb (GApplication *application,
return 1;
}
- if (show_help)
+ if (show_help || show_help_all || show_help_gtk)
{
gchar *help;
+ GOptionGroup *group;
- help = g_option_context_get_help (context, FALSE, NULL);
+ if (show_help || show_help_all)
+ group = NULL;
+ else
+ group = gtk_get_option_group (FALSE);
+
+ help = g_option_context_get_help (context, FALSE, group);
g_print ("%s", help);
g_free (help);
g_option_context_free (context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]