Work around some problems with the gnome-vfs backends which could lead to

2005-08-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c: Work around some problems
	with the gnome-vfs backends which could lead to crashes
	in the bookmark handling.  (#310270, Diego Gonzalez, patch
	by Michael Meeks)

diff --git a/ChangeLog b/ChangeLog
index f46c74af0fa3c2ae564d0c68cc2640eee346e09b..b6303313fa345e948a86ea8e3536a9c52ba294e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: Work around some problems
+       with the gnome-vfs backends which could lead to crashes
+       in the bookmark handling.  (#310270, Diego Gonzalez, patch
+       by Michael Meeks)
+
 2005-08-11  Kristian Rietveld  <kris@gtk.org>
 
        Fix for #312924, by John Finlay.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f46c74af0fa3c2ae564d0c68cc2640eee346e09b..b6303313fa345e948a86ea8e3536a9c52ba294e1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: Work around some problems
+       with the gnome-vfs backends which could lead to crashes
+       in the bookmark handling.  (#310270, Diego Gonzalez, patch
+       by Michael Meeks)
+
 2005-08-11  Kristian Rietveld  <kris@gtk.org>
 
        Fix for #312924, by John Finlay.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f46c74af0fa3c2ae564d0c68cc2640eee346e09b..b6303313fa345e948a86ea8e3536a9c52ba294e1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: Work around some problems
+       with the gnome-vfs backends which could lead to crashes
+       in the bookmark handling.  (#310270, Diego Gonzalez, patch
+       by Michael Meeks)
+
 2005-08-11  Kristian Rietveld  <kris@gtk.org>
 
        Fix for #312924, by John Finlay.

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 5d23161a0be0a66987833f37fc10bed8e0e6c4d2..bd1b8c9fc8c91123b438d575614c76d4e6756eda 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1075,6 +1075,8 @@ change_folder_and_display_error (GtkFileChooserDefault *impl,
   gboolean result;
   GtkFilePath *path_copy;
 
+  g_return_val_if_fail (path != NULL, FALSE);
+
   profile_start ("start", (char *) path);
 
   /* We copy the path because of this case:
@@ -2060,8 +2062,8 @@ shortcut_find_position (GtkFileChooserDefault *impl,
              volume = col_data;
              base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
 
-             exists = strcmp (gtk_file_path_get_string (path),
-                              gtk_file_path_get_string (base_path)) == 0;
+             exists = base_path && strcmp (gtk_file_path_get_string (path),
+                                           gtk_file_path_get_string (base_path)) == 0;
              g_free (base_path);
 
              if (exists)
@@ -2092,6 +2094,8 @@ shortcuts_add_bookmark_from_path (GtkFileChooserDefault *impl,
 {
   GError *error;
 
+  g_return_val_if_fail (path != NULL, FALSE);
+ 
   if (shortcut_find_position (impl, path) != -1)
     return FALSE;