? 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 15:15:18 -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 15:15:19 -0000
@@ -437,10 +437,20 @@ print_entry (GOptionGroup       *group,
   g_string_free (str, TRUE);  
 }
 
-static void
-print_help (GOptionContext *context,
-	    gboolean        main_help,
-	    GOptionGroup   *group) 
+/**
+ * g_option_context_print_help:
+ * @context: a #GOptionContext
+ * @main_help:
+ * @group: or %NULL
+ * 
+ * Prints help
+ *
+ * Since: 2.12
+ **/
+void
+g_option_context_print_help (GOptionContext *context,
+			     gboolean        main_help,
+			     GOptionGroup   *group) 
 {
   GList *list;
   gint max_length, len;
@@ -1300,9 +1310,9 @@ g_option_context_parse (GOptionContext  
 		  if (context->help_enabled)
 		    {
 		      if (strcmp (arg, "help") == 0)
-			print_help (context, TRUE, NULL);
+			g_option_context_print_help (context, TRUE, NULL);
 		      else if (strcmp (arg, "help-all") == 0)
-			print_help (context, FALSE, NULL);		      
+			g_option_context_print_help (context, FALSE, NULL);		      
 		      else if (strncmp (arg, "help-", 5) == 0)
 			{
 			  GList *list;
@@ -1314,7 +1324,7 @@ g_option_context_parse (GOptionContext  
 			      GOptionGroup *group = list->data;
 			      
 			      if (strcmp (arg + 5, group->name) == 0)
-				print_help (context, FALSE, group);		      			      
+				g_option_context_print_help (context, FALSE, group);		      			      
 			      
 			      list = list->next;
 			    }
@@ -1392,7 +1402,7 @@ g_option_context_parse (GOptionContext  
 		  for (j = 0; j < strlen (arg); j++)
 		    {
 		      if (context->help_enabled && arg[j] == '?')
-			print_help (context, TRUE, NULL);
+			g_option_context_print_help (context, TRUE, NULL);
 		      
 		      parsed = FALSE;
 		      
@@ -1788,7 +1798,7 @@ g_option_group_set_translation_domain (G
 				     (GTranslateFunc)dgettext_swapped,
 				     g_strdup (domain),
 				     g_free);
-} 
+}
 
 #define __G_OPTION_C__
 #include "galiasdef.c"
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 15:15:19 -0000
@@ -99,6 +99,9 @@ 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,
+					     gboolean        main_help,
+					     GOptionGroup   *group);
 void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
 							     gboolean	     ignore_unknown);
 gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
