diff options
| author | Kristian Rietveld <kris@imendio.com> | 2006-05-01 21:41:12 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2006-05-01 21:41:12 +0000 |
| commit | 2c97a8f6e8f260695515dabcb5185d0603dcd4f3 (patch) | |
| tree | 68a070f95b168f8415fc6a438aa5436a9096716d /gtk/gtkfilechooser.c | |
| parent | 46789c877d6b4f73ca267bc78f31337be30ad889 (diff) | |
| download | gtk+-2c97a8f6e8f260695515dabcb5185d0603dcd4f3.tar.gz | |
Merge of the GTK+ asynchronous file chooser branch. Please see theAFTER_KRIS_ASYNC_BRANCH_MERGE
2006-05-01 Kristian Rietveld <kris@imendio.com>
Merge of the GTK+ asynchronous file chooser branch. Please see
the kris-asynch-branch for more detailed ChangeLog entries.
* configure.in: increase binary version to 2.9.0.
* gtk.symbols:
* gtkfilechooser.c:
* gtkfilechooserbutton.c:
* gtkfilechooserdefault.c:
* gtkfilechooserdialog.c:
* gtkfilechooserembed.c:
* gtkfilechooserembed.h:
* gtkfilechooserentry.c:
* gtkfilechooserentry.h:
* gtkfilechooserprivate.h:
* gtkfilesystem.c:
* gtkfilesystem.h:
* gtkfilesystemmodel.c:
* gtkfilesystemmodel.h:
* gtkfilesystemunix.c:
* gtkpathbar.c:
* gtkpathbar.h:
Merge from kris-async-branch.
Diffstat (limited to 'gtk/gtkfilechooser.c')
| -rw-r--r-- | gtk/gtkfilechooser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 3f9b943f80..55689952b3 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -717,6 +717,9 @@ gtk_file_chooser_get_current_folder (GtkFileChooser *chooser) file_system = _gtk_file_chooser_get_file_system (chooser); path = _gtk_file_chooser_get_current_folder_path (chooser); + if (!path) + return NULL; + filename = gtk_file_system_path_to_filename (file_system, path); gtk_file_path_free (path); |