From: Matthias Clasen Date: Wed, 18 May 2005 21:00:44 +0000 (+0000) Subject: Use the correct function to conver the uri to a path. (#304565, Ismael X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=5bf4b2f4424a6f65167aadd58a4caf6aeb86f99e;p=~andy%2Fgtk Use the correct function to conver the uri to a path. (#304565, Ismael 2005-05-18 Matthias Clasen * gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): Use the correct function to conver the uri to a path. (#304565, Ismael Juma) --- diff --git a/ChangeLog b/ChangeLog index aca2ba23a..f4abc21a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): + Use the correct function to conver the uri to a path. (#304565, + Ismael Juma) + * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the Cancel button properly. (#304234, Sven Neumann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index aca2ba23a..f4abc21a2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): + Use the correct function to conver the uri to a path. (#304565, + Ismael Juma) + * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the Cancel button properly. (#304234, Sven Neumann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index aca2ba23a..f4abc21a2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooser.c (gtk_file_chooser_remove_shortcut_folder_uri): + Use the correct function to conver the uri to a path. (#304565, + Ismael Juma) + * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the Cancel button properly. (#304234, Sven Neumann) diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 0c1291931..2241aef27 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -1742,7 +1742,7 @@ gtk_file_chooser_remove_shortcut_folder_uri (GtkFileChooser *chooser, g_return_val_if_fail (GTK_IS_FILE_CHOOSER (chooser), FALSE); g_return_val_if_fail (uri != NULL, FALSE); - path = gtk_file_system_filename_to_path (_gtk_file_chooser_get_file_system (chooser), uri); + path = gtk_file_system_uri_to_path (_gtk_file_chooser_get_file_system (chooser), uri); if (!path) { g_set_error (error,