Include the backslash. Otherwise gtk_file_system_win32_path_to_uri()

2004-03-21  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkfilesystemwin32.c
	(gtk_file_system_win32_volume_get_base_path): Include the
	backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
	NULL for a volume base path, as g_filename_to_uri() requires an
	absolute path, and just a drive letter and colon isn't. (#137543)

diff --git a/ChangeLog b/ChangeLog
index 83e21d5bc7a73d7113fde4db0e133463f06e37c3..d3c00bee8d48dc4d01407974785922d439cc556f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtkfilesystemwin32.c
+       (gtk_file_system_win32_volume_get_base_path): Include the
+       backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
+       NULL for a volume base path, as g_filename_to_uri() requires an
+       absolute path, and just a drive letter and colon isn't. (#137543)
+
 2004-03-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : applied the undisputable and

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 83e21d5bc7a73d7113fde4db0e133463f06e37c3..d3c00bee8d48dc4d01407974785922d439cc556f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-03-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtkfilesystemwin32.c
+       (gtk_file_system_win32_volume_get_base_path): Include the
+       backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
+       NULL for a volume base path, as g_filename_to_uri() requires an
+       absolute path, and just a drive letter and colon isn't. (#137543)
+
 2004-03-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : applied the undisputable and

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 83e21d5bc7a73d7113fde4db0e133463f06e37c3..d3c00bee8d48dc4d01407974785922d439cc556f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2004-03-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtkfilesystemwin32.c
+       (gtk_file_system_win32_volume_get_base_path): Include the
+       backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
+       NULL for a volume base path, as g_filename_to_uri() requires an
+       absolute path, and just a drive letter and colon isn't. (#137543)
+
 2004-03-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : applied the undisputable and

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 83e21d5bc7a73d7113fde4db0e133463f06e37c3..d3c00bee8d48dc4d01407974785922d439cc556f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-03-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtkfilesystemwin32.c
+       (gtk_file_system_win32_volume_get_base_path): Include the
+       backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
+       NULL for a volume base path, as g_filename_to_uri() requires an
+       absolute path, and just a drive letter and colon isn't. (#137543)
+
 2004-03-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : applied the undisputable and

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 83e21d5bc7a73d7113fde4db0e133463f06e37c3..d3c00bee8d48dc4d01407974785922d439cc556f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-03-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtkfilesystemwin32.c
+       (gtk_file_system_win32_volume_get_base_path): Include the
+       backslash. Otherwise gtk_file_system_win32_path_to_uri() returns
+       NULL for a volume base path, as g_filename_to_uri() requires an
+       absolute path, and just a drive letter and colon isn't. (#137543)
+
 2004-03-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : applied the undisputable and

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index 8688e21b5e33bb03913523421ad102d33d820f37..350823db6c4efaf010315a0612b45589c92e05ea 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -396,7 +396,7 @@ static GtkFilePath *
 gtk_file_system_win32_volume_get_base_path (GtkFileSystem        *file_system,
                                            GtkFileSystemVolume  *volume)
 {
-  return (GtkFilePath *) g_strndup (volume->drive, 2);
+  return (GtkFilePath *) g_strdup (volume->drive);
 }
 
 static gboolean