Merged from gtk-2-6:

2005-04-18  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
	obsolete assertion that the selected row can't be a volume; this
	is handled by the "removable" column now.  Fixes #301017.

diff --git a/ChangeLog b/ChangeLog
index 4c137d4f0ee7531bd44073fea663b06e79580595..213a50408a6f816e54a0dca9dff3ec15a29fd0f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+       obsolete assertion that the selected row can't be a volume; this
+       is handled by the "removable" column now.  Fixes #301017.
+
 2005-04-18  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4c137d4f0ee7531bd44073fea663b06e79580595..213a50408a6f816e54a0dca9dff3ec15a29fd0f4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+       obsolete assertion that the selected row can't be a volume; this
+       is handled by the "removable" column now.  Fixes #301017.
+
 2005-04-18  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4c137d4f0ee7531bd44073fea663b06e79580595..213a50408a6f816e54a0dca9dff3ec15a29fd0f4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-04-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (remove_selected_bookmarks): Remove
+       obsolete assertion that the selected row can't be a volume; this
+       is handled by the "removable" column now.  Fixes #301017.
+
 2005-04-18  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 715232d0d2adadf7bb9f1c09108e061aec3c74ba..e8922210faa6cebe7698089b0584b40f2766c329 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2049,7 +2049,6 @@ remove_selected_bookmarks (GtkFileChooserDefault *impl)
 {
   GtkTreeIter iter;
   gpointer col_data;
-  gboolean is_volume;
   GtkFilePath *path;
   gboolean removable;
   GError *error;
@@ -2059,11 +2058,9 @@ remove_selected_bookmarks (GtkFileChooserDefault *impl)
 
   gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
                      SHORTCUTS_COL_DATA, &col_data,
-                     SHORTCUTS_COL_IS_VOLUME, &is_volume,
                      SHORTCUTS_COL_REMOVABLE, &removable,
                      -1);
   g_assert (col_data != NULL);
-  g_assert (!is_volume);
 
   if (!removable)
     return;