Translation updated by Ivar Smolin.

[~andy/gtk] / gtk / gtkfilesystemwin32.c

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index a347cde7f5be411896940c85588cf219da152c14..31547b042aabed9c6c45b1c45138f14bfa3c35cb 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -2,6 +2,8 @@
  * gtkfilesystemwin32.c: Default implementation of GtkFileSystem for Windows
  * Copyright (C) 2003, Red Hat, Inc.
  * Copyright (C) 2004, Hans Breuer
+ * Copyright (C) 2007, Novell, Inc.
+ * Copyright (C) 2007, Mathias Hasselmann
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -971,8 +973,8 @@ gtk_file_system_win32_get_info (GtkFileSystem               *file_system,
   handle = create_handle (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
-  g_return_val_if_fail (g_path_is_absolute (filename), FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   if (!stat_with_error (filename, &wfad, &error))
     {
@@ -1146,7 +1148,7 @@ gtk_file_system_win32_create_folder (GtkFileSystem                    *file_syst
   system_win32 = GTK_FILE_SYSTEM_WIN32 (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
   g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   handle = create_handle (file_system);
@@ -1399,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))