From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 30 Oct 2004 03:20:31 +0000 (+0000)
Subject: Convert filenames to UTF-8 on Windows.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b190dce984e1b2af1e9fd90bc223367fb7e493e4;p=dana%2Fcg-glib.git

Convert filenames to UTF-8 on Windows.

2004-10-29  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
	Windows.
---

diff --git a/ChangeLog b/ChangeLog
index 8c3b5661..1542390c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
+	Windows.
+
 2004-10-29  Hans Breuer  <hans@breuer.org>
 
 	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8c3b5661..1542390c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
+	Windows.
+
 2004-10-29  Hans Breuer  <hans@breuer.org>
 
 	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8c3b5661..1542390c 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
+	Windows.
+
 2004-10-29  Hans Breuer  <hans@breuer.org>
 
 	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8c3b5661..1542390c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
+	Windows.
+
 2004-10-29  Hans Breuer  <hans@breuer.org>
 
 	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8c3b5661..1542390c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
+	Windows.
+
 2004-10-29  Hans Breuer  <hans@breuer.org>
 
 	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
diff --git a/glib/goption.c b/glib/goption.c
index 931d5c89..5905382f 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -658,8 +658,14 @@ parse_arg (GOptionContext *context,
       {
 	gchar *data;
 
+#ifdef G_OS_WIN32
+	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	
+	if (!data)
+	  return FALSE;
+#else
 	data = g_strdup (value);
-
+#endif
 	change = get_change (context, G_OPTION_ARG_FILENAME,
 			     entry->arg_data);
 	g_free (change->allocated.str);
@@ -675,8 +681,14 @@ parse_arg (GOptionContext *context,
       {
 	gchar *data;
 	
+#ifdef G_OS_WIN32
+	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+	
+	if (!data)
+	  return FALSE;
+#else
 	data = g_strdup (value);
-
+#endif
 	change = get_change (context, G_OPTION_ARG_STRING_ARRAY,
 			     entry->arg_data);