From ec66d4530edae44e53b7d2ed513cd8bc420a8178 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 24 Feb 2005 23:46:36 +0000 Subject: [PATCH] Use g_fopen(). (#168341, Daniel Atallah) 2005-02-24 Tor Lillqvist * glib/gfileutils.c (get_contents_win32): Use g_fopen(). (#168341, Daniel Atallah) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gfileutils.c | 4 +--- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a981c264..6cac6d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-24 Tor Lillqvist + + * glib/gfileutils.c (get_contents_win32): Use g_fopen(). (#168341, + Daniel Atallah) + 2005-02-23 Matthias Clasen * configure.in: Don't forget to set G_THREAD_LIBS_FOR_GTHREAD diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a981c264..6cac6d58 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-02-24 Tor Lillqvist + + * glib/gfileutils.c (get_contents_win32): Use g_fopen(). (#168341, + Daniel Atallah) + 2005-02-23 Matthias Clasen * configure.in: Don't forget to set G_THREAD_LIBS_FOR_GTHREAD diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a981c264..6cac6d58 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-02-24 Tor Lillqvist + + * glib/gfileutils.c (get_contents_win32): Use g_fopen(). (#168341, + Daniel Atallah) + 2005-02-23 Matthias Clasen * configure.in: Don't forget to set G_THREAD_LIBS_FOR_GTHREAD diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a981c264..6cac6d58 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-02-24 Tor Lillqvist + + * glib/gfileutils.c (get_contents_win32): Use g_fopen(). (#168341, + Daniel Atallah) + 2005-02-23 Matthias Clasen * configure.in: Don't forget to set G_THREAD_LIBS_FOR_GTHREAD diff --git a/glib/gfileutils.c b/glib/gfileutils.c index fb2462f6..14f74580 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -717,13 +717,11 @@ get_contents_win32 (const gchar *filename, { FILE *f; gboolean retval; - wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); gchar *display_filename = g_filename_display_name (filename); int save_errno; - f = _wfopen (wfilename, L"rb"); + f = g_fopen (filename, "rb"); save_errno = errno; - g_free (wfilename); if (f == NULL) { -- 2.34.1