Commit 378c64c3 authored by Morten Welinder's avatar Morten Welinder

Win32: make sure we delocalize filename only once.

We patch glib, but we stopped calling the patched code a while back.
parent 7fe4ce4a
......@@ -17,6 +17,7 @@ Morten:
* Fix fuzzed file crashes. [#720425] [#720426] [#720358] [#719349]
[#715002]
* Resurrect list of functions on the new Gnumeric wiki.
* Resurrect support for non-ascii filenames on win32. [#557815]
--------------------------------------------------------------------------
Gnumeric 1.12.9
......
......@@ -146,7 +146,7 @@ gnumeric_arg_parse (int argc, char **argv)
g_option_context_add_main_entries (ocontext, gnumeric_options, GETTEXT_PACKAGE);
g_option_context_add_group (ocontext, gnm_get_option_group ());
#if defined(G_OS_WIN32) && defined(HAVE_G_OPTION_CONTEXT_SET_DELOCALIZE)
#if defined(G_OS_WIN32)
/* we have already translated to utf8, do not do it again.
* http://bugzilla.gnome.org/show_bug.cgi?id=361321 */
g_option_context_set_delocalize (ocontext, FALSE);
......
......@@ -108,9 +108,9 @@ diff -ur glib-2.26.0/glib/goption.h glib-2.26.0-new//glib/goption.h
void g_option_context_set_ignore_unknown_options (GOptionContext *context,
gboolean ignore_unknown);
gboolean g_option_context_get_ignore_unknown_options (GOptionContext *context);
+void g_option_context_set_delocalize (GOptionContext *context,
+GLIB_AVAILABLE_IN_ALL void g_option_context_set_delocalize (GOptionContext *context,
+ gboolean ignore_unknown);
+gboolean g_option_context_get_delocalize (GOptionContext *context);
+GLIB_AVAILABLE_IN_ALL gboolean g_option_context_get_delocalize (GOptionContext *context);
void g_option_context_add_main_entries (GOptionContext *context,
const GOptionEntry *entries,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment