From a2e95582caeb907516af2d2b3386f30d34d7a2d7 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 22 Jun 2004 20:08:36 +0000 Subject: [PATCH] Fixes the GTK+ part of #142308: 2004-06-22 Federico Mena Quintero Fixes the GTK+ part of #142308: * gtk/gtkfilesystemunix.c (gtk_file_system_unix_filename_to_path): Use filename_to_path(). (gtk_file_system_unix_uri_to_path): Likewise. (filename_to_path): Use remove_trailing_slash(). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkfilesystemunix.c | 18 ++++++++++++++---- 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3ff17215b..1350232edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-06-22 Federico Mena Quintero + + Fixes the GTK+ part of #142308: + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_filename_to_path): + Use filename_to_path(). + (gtk_file_system_unix_uri_to_path): Likewise. + (filename_to_path): Use remove_trailing_slash(). + 2004-06-22 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_class_init): Improve docs diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a3ff17215b..1350232edf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2004-06-22 Federico Mena Quintero + + Fixes the GTK+ part of #142308: + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_filename_to_path): + Use filename_to_path(). + (gtk_file_system_unix_uri_to_path): Likewise. + (filename_to_path): Use remove_trailing_slash(). + 2004-06-22 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_class_init): Improve docs diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a3ff17215b..1350232edf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2004-06-22 Federico Mena Quintero + + Fixes the GTK+ part of #142308: + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_filename_to_path): + Use filename_to_path(). + (gtk_file_system_unix_uri_to_path): Likewise. + (filename_to_path): Use remove_trailing_slash(). + 2004-06-22 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_class_init): Improve docs diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a3ff17215b..1350232edf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2004-06-22 Federico Mena Quintero + + Fixes the GTK+ part of #142308: + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_filename_to_path): + Use filename_to_path(). + (gtk_file_system_unix_uri_to_path): Likewise. + (filename_to_path): Use remove_trailing_slash(). + 2004-06-22 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_class_init): Improve docs diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 2357bafcfa..c61a079670 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -1018,18 +1018,25 @@ static GtkFilePath * gtk_file_system_unix_uri_to_path (GtkFileSystem *file_system, const gchar *uri) { + GtkFilePath *path; gchar *filename = g_filename_from_uri (uri, NULL, NULL); + if (filename) - return gtk_file_path_new_steal (filename); + { + path = filename_to_path (filename); + g_free (filename); + } else - return NULL; + path = NULL; + + return path; } static GtkFilePath * gtk_file_system_unix_filename_to_path (GtkFileSystem *file_system, const gchar *filename) { - return gtk_file_path_new_dup (filename); + return filename_to_path (filename); } static const char * @@ -1833,7 +1840,10 @@ fill_in_mime_type (GtkFileFolderUnix *folder_unix, GError **error) static GtkFilePath * filename_to_path (const char *filename) { - return gtk_file_path_new_dup (filename); + char *tmp; + + tmp = remove_trailing_slash (filename); + return gtk_file_path_new_steal (tmp); } static gboolean