From a1e455446281f6a6a1a4eac14cd064cd9cfa93a7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Mar 2007 21:30:32 +0000 Subject: [PATCH] Remove C99isms. (#416525, Kazuki Iwamoto) 2007-03-09 Matthias Clasen * gtk/gtkfilesystemwin32.c (get_icon_path): Remove C99isms. (#416525, Kazuki Iwamoto) svn path=/trunk/; revision=17442 --- ChangeLog | 5 +++++ gtk/gtkfilesystemwin32.c | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99b7a196dc..c4ec79b80d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-09 Matthias Clasen + + * gtk/gtkfilesystemwin32.c (get_icon_path): Remove + C99isms. (#416525, Kazuki Iwamoto) + 2007-03-09 Tor Lillqvist * README.win32: Update. diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index ae5d0c14a2..f8fce08f69 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -1401,14 +1401,13 @@ get_icon_path (const gchar *filename, gint *index) { gchar *path = NULL; + SHFILEINFOW shfi; + wchar_t *wfn; g_return_val_if_fail (NULL != filename, NULL); g_return_val_if_fail ('\0' != *filename, NULL); g_return_val_if_fail (NULL != index, NULL); - SHFILEINFOW shfi; - wchar_t *wfn; - wfn = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); if (SHGetFileInfoW (wfn, 0, &shfi, sizeof (shfi), SHGFI_ICONLOCATION))