Display an error when we come to the root.

[~andy/gtk] / gtk / gtkfilechooserdefault.c

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 74d2dc5439802e9771dbf0f24930374a25d1fe05..c5338b9b69ef938d9d21ae5188e07bc943c09c88 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6174,7 +6174,8 @@ update_current_folder_get_info_cb (GtkFileSystemHandle *handle,
        }
 
       /* get parent path and try to change the folder to that */
-      if (gtk_file_system_get_parent (impl->file_system, data->path, &parent_path, NULL))
+      if (gtk_file_system_get_parent (impl->file_system, data->path, &parent_path, NULL) &&
+         parent_path != NULL)
         {
          gtk_file_path_free (data->path);
          data->path = parent_path;
@@ -8670,6 +8671,3 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl,
 
   return GTK_TREE_MODEL (model);
 }
-
-#define __GTK_FILE_CHOOSER_DEFAULT_C__
-#include "gtkaliasdef.c"