? a
? attachment.cgi?id=47871
? display-name.patch
? gtk-icontheme-cache.patch
? gtk-memuse.patch
? gdk-pixbuf/a
? gdk-pixbuf/core.27896
? tests/core.24925
? tests/core.24933
Index: gtk/gtkfilechooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
retrieving revision 1.282
diff -u -p -r1.282 gtkfilechooserdefault.c
--- gtk/gtkfilechooserdefault.c	23 Aug 2005 12:48:05 -0000	1.282
+++ gtk/gtkfilechooserdefault.c	1 Sep 2005 12:23:29 -0000
@@ -1617,13 +1617,16 @@ shortcuts_add_volumes (GtkFileChooserDef
       if (impl->local_only)
 	{
 	  GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
-	  gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
-	  gtk_file_path_free (base_path);
-
-	  if (!is_local)
+	  if (base_path != NULL)
 	    {
-	      gtk_file_system_volume_free (impl->file_system, volume);
-	      continue;
+	      gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
+	      gtk_file_path_free (base_path);
+	      
+	      if (!is_local)
+		{
+		  gtk_file_system_volume_free (impl->file_system, volume);
+		  continue;
+		}
 	    }
 	}
 
@@ -6645,8 +6648,11 @@ shortcuts_activate_volume (GtkFileChoose
     }
 
   path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
-  change_folder_and_display_error (impl, path);
-  gtk_file_path_free (path);
+  if (path != NULL)
+    {
+      change_folder_and_display_error (impl, path);
+      gtk_file_path_free (path);
+    }
 
  out:
 
