[gnumeric] Win32: make sure we delocalize filename only once.

[Morten Welinder <mortenw src gnome org>]

commit 378c64c324816d234781b4bba01b2540ebb0a524
Author: Morten Welinder <terra gnome org>
Date:   Mon Dec 23 23:30:40 2013 -0500

    Win32: make sure we delocalize filename only once.
    
    We patch glib, but we stopped calling the patched code a while back.

 NEWS                                               |    1 +
 src/main-application.c                             |    2 +-
 .../glib-goption-disable-localization.patch        |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 763fb99..e38cc0b 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/src/main-application.c b/src/main-application.c
index f4f9bc4..c2d0e6e 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -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);
diff --git a/tools/win32/patches/glib-goption-disable-localization.patch 
b/tools/win32/patches/glib-goption-disable-localization.patch
index 5c86cb8..6508e05 100644
--- a/tools/win32/patches/glib-goption-disable-localization.patch
+++ b/tools/win32/patches/glib-goption-disable-localization.patch
@@ -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,