diff --git a/ChangeLog b/ChangeLog
index 87e3aa0b12..a958b195a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkfilesystemwin32.c : applied patch from
+	J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135641
+
 Sat Feb 28 23:30:36 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_popup): Actually resize the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 87e3aa0b12..a958b195a2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkfilesystemwin32.c : applied patch from
+	J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135641
+
 Sat Feb 28 23:30:36 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_popup): Actually resize the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 87e3aa0b12..a958b195a2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkfilesystemwin32.c : applied patch from
+	J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135641
+
 Sat Feb 28 23:30:36 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_popup): Actually resize the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 87e3aa0b12..a958b195a2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkfilesystemwin32.c : applied patch from
+	J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135641
+
 Sat Feb 28 23:30:36 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_popup): Actually resize the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 87e3aa0b12..a958b195a2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-02-28  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkfilesystemwin32.c : applied patch from
+	J. Ali Harlow <ali@juiblex.co.uk>, fixes bug #135641
+
 Sat Feb 28 23:30:36 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_popup): Actually resize the
diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index c16905e10e..9fe5412294 100644
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include <sys/types.h>
 
 #ifdef G_OS_WIN32
@@ -321,7 +322,7 @@ gtk_file_system_win32_get_volume_for_path (GtkFileSystem     *file_system,
                                            const GtkFilePath *path)
 {
   GtkFileSystemVolume *vol = g_new0 (GtkFileSystemVolume, 1);
-  gchar* p = g_strndup (path, 3);
+  gchar* p = g_strndup (gtk_file_path_get_string (path), 3);
 
   g_return_val_if_fail (p != NULL, NULL);
 
@@ -742,7 +743,7 @@ bookmarks_serialize (GSList  **bookmarks,
 
 	      for (i = 0; lines[i] != NULL; i++)
 		{
-		  if (lines[i][0] && !g_slist_find_custom (list, lines[i], strcmp))
+		  if (lines[i][0] && !g_slist_find_custom (list, lines[i], (GCompareFunc) strcmp))
 		    list = g_slist_append (list, g_strdup (lines[i]));
 		}
 	      g_strfreev (lines);
@@ -759,7 +760,7 @@ bookmarks_serialize (GSList  **bookmarks,
 	       * positon > length ?
 	       * 
 	       */
-	      if (!g_slist_find_custom (list, uri, strcmp))
+	      if (!g_slist_find_custom (list, uri, (GCompareFunc) strcmp))
                 list = g_slist_insert (list, g_strdup (uri), position);
 	      else
 	        {
@@ -1255,8 +1256,8 @@ filename_get_info (const gchar     *filename,
       GtkFileTime time = wfad.ftLastWriteTime.dwLowDateTime 
                        | ((guint64)wfad.ftLastWriteTime.dwHighDateTime) << 32;
       /* 100-nanosecond intervals since January 1, 1601, urgh! */
-      time /= 10000000I64; /* now seconds */
-      time -= 134774I64 * 24 * 3600; /* good old Unix time */
+      time /= G_GINT64_CONSTANT (10000000); /* now seconds */
+      time -= G_GINT64_CONSTANT (134774) * 24 * 3600; /* good old Unix time */
       gtk_file_info_set_modification_time (info, time);
     }