From d22aa7c0f5142fcf9392dca19d42ff3ca220cf3b Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 18 Apr 2005 17:56:57 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-04-18 Federico Mena Quintero 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. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkfilechooserdefault.c | 3 --- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c137d4f0e..213a50408a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-04-18 Federico Mena Quintero + + 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 * 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 4c137d4f0e..213a50408a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-04-18 Federico Mena Quintero + + 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 * 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 4c137d4f0e..213a50408a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-04-18 Federico Mena Quintero + + 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 * gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 715232d0d2..e8922210fa 100644 --- 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; -- GitLab