? 33609.patch
? build/win32/vs8/Makefile
? build/win32/vs8/Makefile.in
Index: glib/glib.symbols
===================================================================
RCS file: /cvs/gnome/glib/glib/glib.symbols,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 glib.symbols
--- glib/glib.symbols	23 Mar 2006 02:54:28 -0000	1.58
+++ glib/glib.symbols	26 Mar 2006 18:37:39 -0000
@@ -701,6 +701,7 @@ g_option_group_set_error_hook
 g_option_group_set_parse_hooks
 g_option_group_set_translate_func
 g_option_group_set_translation_domain
+g_option_context_print_help
 #endif
 #endif
 
Index: glib/goption.c
===================================================================
RCS file: /cvs/gnome/glib/glib/goption.c,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 goption.c
--- glib/goption.c	15 Mar 2006 13:03:48 -0000	1.49
+++ glib/goption.c	26 Mar 2006 18:37:40 -0000
@@ -114,6 +114,10 @@ static void free_changes_list (GOptionCo
 static void free_pending_nulls (GOptionContext *context,
 				gboolean        perform_nulls);
 
+static void print_help (GOptionContext *context,
+			gboolean        main_help,
+			GOptionGroup   *group);
+
 GQuark
 g_option_error_quark (void)
 {
@@ -180,6 +184,18 @@ void g_option_context_free (GOptionConte
   g_free (context);
 }
 
+/**
+ * g_option_context_print_help:
+ * @context: a #GOptionContext
+ *
+ * Prints the equivalent of <option>--help-all</option> to stdout. 
+ *
+ * Since: 2.12
+ */
+void g_option_context_print_help (GOptionContext *context)
+{
+  print_help (context, FALSE, NULL);
+}
 
 /**
  * g_option_context_set_help_enabled:
Index: glib/goption.h
===================================================================
RCS file: /cvs/gnome/glib/glib/goption.h,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 goption.h
--- glib/goption.h	12 Jul 2005 18:56:24 -0000	1.10
+++ glib/goption.h	26 Mar 2006 18:37:40 -0000
@@ -99,6 +99,7 @@ void            g_option_context_free   
 void		g_option_context_set_help_enabled (GOptionContext      *context,
 						   gboolean		help_enabled);
 gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
+void            g_option_context_print_help (GOptionContext *context);
 void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
 							     gboolean	     ignore_unknown);
 gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
