File glib-2.36.0-goption-disable-localization.patch of Package mingw32-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File glib-2.36.0-goption-disable-localization.patch of Package mingw32-glib2 (Revision b4c67b5c566b62d46700c40c7d8b63fc)

Currently displaying revision b4c67b5c566b62d46700c40c7d8b63fc , Show latest

diff -Naur glib-2.36.0/glib/goption.c glib-2.36.0-goption-disable-localization/glib/goption.c
--- glib-2.36.0/glib/goption.c	2013-03-25 18:02:43.000000000 +0100
+++ glib-2.36.0-goption-disable-localization/glib/goption.c	2013-03-27 10:53:37.367209429 +0100
@@ -204,6 +204,7 @@
 
   guint            help_enabled   : 1;
   guint            ignore_unknown : 1;
+  guint		   delocalize : 1;
 
   GOptionGroup    *main_group;
 
@@ -317,6 +318,7 @@
   context->parameter_string = g_strdup (parameter_string);
   context->help_enabled = TRUE;
   context->ignore_unknown = FALSE;
+  context->delocalize = TRUE;
 
   return context;
 }
@@ -442,6 +444,23 @@
   return context->ignore_unknown;
 }
 
+void
+g_option_context_set_delocalize (GOptionContext *context,
+				 gboolean	 delocalize)
+{
+  g_return_if_fail (context != NULL);
+
+  context->delocalize = delocalize;
+}
+
+gboolean
+g_option_context_get_delocalize (GOptionContext *context)
+{
+  g_return_if_fail (context != NULL);
+
+  return context->delocalize;
+}
+
 /**
  * g_option_context_add_group:
  * @context: a #GOptionContext
@@ -1151,7 +1170,10 @@
       {
         gchar *data;
 
+	if (context->delocalize)
         data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	else
+	    data = g_strdup (value);
 
         if (!data)
           return FALSE;
@@ -1170,7 +1192,10 @@
       {
         gchar *data;
 
+	if (context->delocalize)
         data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	else
+	    data = g_strdup (value);
 
         if (!data)
           return FALSE;
@@ -1203,7 +1228,10 @@
         gchar *data;
 
 #ifdef G_OS_WIN32
+	if (context->delocalize)
         data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	else
+	    data = g_strdup (value);
 
         if (!data)
           return FALSE;
@@ -1226,7 +1254,10 @@
         gchar *data;
 
 #ifdef G_OS_WIN32
+	if (context->delocalize)
         data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	else
+	    data = g_strdup (value);
 
         if (!data)
           return FALSE;
@@ -1283,13 +1314,21 @@
         else if (entry->flags & G_OPTION_FLAG_FILENAME)
           {
 #ifdef G_OS_WIN32
+	    if (context->delocalize)
             data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	    else
+		data = g_strdup (value);
 #else
             data = g_strdup (value);
 #endif
           }
         else
+	  {
+	    if (context->delocalize)
           data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	    else
+		data = g_strdup (value);
+	  }
 
         if (!(entry->flags & (G_OPTION_FLAG_NO_ARG|G_OPTION_FLAG_OPTIONAL_ARG)) &&
             !data)
diff -Naur glib-2.36.0/glib/goption.h glib-2.36.0-goption-disable-localization/glib/goption.h
--- glib-2.36.0/glib/goption.h	2013-03-13 14:39:09.000000000 +0100
+++ glib-2.36.0-goption-disable-localization/glib/goption.h	2013-03-27 10:53:37.371209450 +0100
@@ -332,6 +332,9 @@
 							     gboolean	     ignore_unknown);
 GLIB_AVAILABLE_IN_ALL
 gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
+void		g_option_context_set_delocalize (GOptionContext *context,
+							     gboolean	     ignore_unknown);
+gboolean        g_option_context_get_delocalize (GOptionContext *context);
 
 GLIB_AVAILABLE_IN_ALL
 void            g_option_context_add_main_entries (GOptionContext      *context,

Places

File glib-2.36.0-goption-disable-localization.patch of Package mingw32-glib2 (Revision b4c67b5c566b62d46700c40c7d8b63fc)

Places