diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/gtkfilechooserdefault.c | 3 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-04-18 Federico Mena Quintero <federico@ximian.com> + + * 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-15 Federico Mena Quintero <federico@ximian.com> * gtk/gtkfilechooserdefault.c (pending_select_paths_process): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 11c3c7eac..6e086a30a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-04-18 Federico Mena Quintero <federico@ximian.com> + + * 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-15 Federico Mena Quintero <federico@ximian.com> * gtk/gtkfilechooserdefault.c (pending_select_paths_process): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 11c3c7eac..6e086a30a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-04-18 Federico Mena Quintero <federico@ximian.com> + + * 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-15 Federico Mena Quintero <federico@ximian.com> * gtk/gtkfilechooserdefault.c (pending_select_paths_process): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index cec2cae25..17357047f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2041,7 +2041,6 @@ remove_selected_bookmarks (GtkFileChooserDefault *impl) { GtkTreeIter iter; gpointer col_data; - gboolean is_volume; GtkFilePath *path; gboolean removable; GError *error; @@ -2051,11 +2050,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; |