From 615342e33b2985cf7b6b0bc37a69841cc12b9ec2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 Sep 2004 04:22:04 +0000 Subject: [PATCH] Use gtk_get_option_group() to obtain an option group with correctly set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2004-09-28 Matthias Clasen * gtk/gtkmain.c (gtk_parse_args): Use gtk_get_option_group() to obtain an option group with correctly set pre- and post- parse hooks, instead of manually calling the hooks. This fixes a problem with setting the program class in the gdk preparse hook. (#153788, Robert Ögren) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkmain.c | 11 +++-------- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d7be4b374..35d950bd3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-09-28 Matthias Clasen + + * gtk/gtkmain.c (gtk_parse_args): Use gtk_get_option_group() + to obtain an option group with correctly set pre- and post- + parse hooks, instead of manually calling the hooks. This fixes + a problem with setting the program class in the gdk preparse + hook. (#153788, Robert Ögren) + 2004-09-27 Matthias Clasen Fix #153082: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d7be4b374..35d950bd3d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-09-28 Matthias Clasen + + * gtk/gtkmain.c (gtk_parse_args): Use gtk_get_option_group() + to obtain an option group with correctly set pre- and post- + parse hooks, instead of manually calling the hooks. This fixes + a problem with setting the program class in the gdk preparse + hook. (#153788, Robert Ögren) + 2004-09-27 Matthias Clasen Fix #153082: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d7be4b374..35d950bd3d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-09-28 Matthias Clasen + + * gtk/gtkmain.c (gtk_parse_args): Use gtk_get_option_group() + to obtain an option group with correctly set pre- and post- + parse hooks, instead of manually calling the hooks. This fixes + a problem with setting the program class in the gdk preparse + hook. (#153788, Robert Ögren) + 2004-09-27 Matthias Clasen Fix #153082: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d7be4b374..35d950bd3d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-09-28 Matthias Clasen + + * gtk/gtkmain.c (gtk_parse_args): Use gtk_get_option_group() + to obtain an option group with correctly set pre- and post- + parse hooks, instead of manually calling the hooks. This fixes + a problem with setting the program class in the gdk preparse + hook. (#153788, Robert Ögren) + 2004-09-27 Matthias Clasen Fix #153082: diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 0d3d5e27b6..ec6c9f8cb2 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -611,6 +611,7 @@ gtk_parse_args (int *argc, char ***argv) { GOptionContext *option_context; + GOptionGroup *gtk_group; if (gtk_initialized) return TRUE; @@ -618,20 +619,14 @@ gtk_parse_args (int *argc, if (!check_setugid ()) return FALSE; - do_pre_parse_initialization (argc, argv); - option_context = g_option_context_new (NULL); g_option_context_set_ignore_unknown_options (option_context, TRUE); g_option_context_set_help_enabled (option_context, FALSE); - - g_option_context_add_main_entries (option_context, gtk_args, GETTEXT_PACKAGE); - gdk_add_option_entries_libgtk_only (g_option_context_get_main_group (option_context)); - + gtk_group = gtk_get_option_group (FALSE); + g_option_context_set_main_group (option_context, gtk_group); g_option_context_parse (option_context, argc, argv, NULL); g_option_context_free (option_context); - do_post_parse_initialization (argc, argv); - return TRUE; }