diff options
| author | Cody Russell <bratsche@gnome.org> | 2008-02-12 21:05:32 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2008-02-12 21:05:32 +0000 |
| commit | fbb07bf75ad3a2561af8703f213cfc8c351e4049 (patch) | |
| tree | 378d1d6ca7a15164a03ad5435692714e3fdc0ecf | |
| parent | 0ae179e974344704b8bc7a383a84fb4a09eee1fc (diff) | |
| download | gdk-pixbuf-fbb07bf75ad3a2561af8703f213cfc8c351e4049.tar.gz | |
Merged from trunk:
2008-02-10 Cody Russell <bratsche@gnome.org>
Merged from trunk:
* gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder_uri):
Check the return value of _gtk_file_chooser_get_file_system () for
NULL before passing it to gtk_file_system_path_to_uri ().
(#515667, Francesco Montorsi)
svn path=/branches/gtk-2-12/; revision=19544
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkfilechooser.c | 3 |
2 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2008-02-10 Cody Russell <bratsche@gnome.org> + + Merged from trunk: + + * gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder_uri): + Check the return value of _gtk_file_chooser_get_file_system () for + NULL before passing it to gtk_file_system_path_to_uri (). + (#515667, Francesco Montorsi) + 2008-02-12 Federico Mena Quintero <federico@novell.com> * gtk/gtkfilechooserdefault.c (switch_to_shortcut): Don't focus diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 68243520b..6c9cfb5c3 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -1049,6 +1049,9 @@ gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser) file_system = _gtk_file_chooser_get_file_system (chooser); path = _gtk_file_chooser_get_current_folder_path (chooser); + if (!path) + return NULL; + uri = gtk_file_system_path_to_uri (file_system, path); gtk_file_path_free (path); |