From: Tor Lillqvist <tml@novell.com>
Date: Sat, 5 Feb 2005 22:09:11 +0000 (+0000)
Subject: In the Win32 ABI stability version, call g_file_get_contents_utf8(), not
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=fc67e936f8741ac27ada5947cac66cf8da7b553d;p=dana%2Fcg-glib.git

In the Win32 ABI stability version, call g_file_get_contents_utf8(), not

2005-02-05  Tor Lillqvist  <tml@novell.com>

	* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
	stability version, call g_file_get_contents_utf8(), not
	itself. (#166386)
---

diff --git a/ChangeLog b/ChangeLog
index 6bc69781..3335df99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
+	stability version, call g_file_get_contents_utf8(), not
+	itself. (#166386)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Remove the --enable-ansi option  (#160469)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6bc69781..3335df99 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-02-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
+	stability version, call g_file_get_contents_utf8(), not
+	itself. (#166386)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Remove the --enable-ansi option  (#160469)
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6bc69781..3335df99 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-02-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
+	stability version, call g_file_get_contents_utf8(), not
+	itself. (#166386)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Remove the --enable-ansi option  (#160469)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6bc69781..3335df99 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-02-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
+	stability version, call g_file_get_contents_utf8(), not
+	itself. (#166386)
+
 2005-02-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Remove the --enable-ansi option  (#160469)
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index d9a19ba1..fb2462f6 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -804,7 +804,7 @@ g_file_get_contents (const gchar *filename,
   if (utf8_filename == NULL)
     return FALSE;
 
-  retval = g_file_get_contents (utf8_filename, contents, length, error);
+  retval = g_file_get_contents_utf8 (utf8_filename, contents, length, error);
 
   g_free (utf8_filename);