From 46b3a1174d425575ad08611db4d5d5f3d0da40d9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 21 Mar 2004 22:06:37 +0000 Subject: [PATCH] Include the backslash. Otherwise gtk_file_system_win32_path_to_uri() 2004-03-21 Tor Lillqvist * 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) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkfilesystemwin32.c | 2 +- 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83e21d5bc7..d3c00bee8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-03-21 Tor Lillqvist + + * 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 * gtk/gtkfilesystemwin32.c : applied the undisputable and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 83e21d5bc7..d3c00bee8d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-03-21 Tor Lillqvist + + * 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 * gtk/gtkfilesystemwin32.c : applied the undisputable and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 83e21d5bc7..d3c00bee8d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2004-03-21 Tor Lillqvist + + * 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 * gtk/gtkfilesystemwin32.c : applied the undisputable and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 83e21d5bc7..d3c00bee8d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-03-21 Tor Lillqvist + + * 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 * gtk/gtkfilesystemwin32.c : applied the undisputable and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 83e21d5bc7..d3c00bee8d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-03-21 Tor Lillqvist + + * 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 * gtk/gtkfilesystemwin32.c : applied the undisputable and diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index 8688e21b5e..350823db6c 100644 --- 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