callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from gtk-2-6:

Browse Source 
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.
This commit is contained in:
Federico Mena Quintero 2005-04-18 17:56:57 +00:00 committed by Federico Mena Quintero
parent 9725c8d752
commit d22aa7c0f5
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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

8
ChangeLog.pre-2-10
View File

@ -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

8
ChangeLog.pre-2-8
View File

@ -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

3
gtk/gtkfilechooserdefault.c
View File

@ -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;