set changing_folders to be true so we don't trigger a callback when we

Mon Mar 15 10:35:19 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
        changing_folders to be true so we don't trigger a callback when we
        remove the selection
        (shortcuts_add_bookmarks): ditto
This commit is contained in:
Jonathan Blandford 2004-03-15 16:27:45 +00:00 committed by Jonathan Blandford
parent 2ede6713a7
commit e8095cc81b
6 changed files with 47 additions and 0 deletions

View File

@ -1,3 +1,10 @@
Mon Mar 15 10:35:19 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
changing_folders to be true so we don't trigger a callback when we
remove the selection
(shortcuts_add_bookmarks): ditto
Mon Mar 15 10:47:18 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilechooserentry.c: s/seperator/separator/.

View File

@ -1,3 +1,10 @@
Mon Mar 15 10:35:19 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
changing_folders to be true so we don't trigger a callback when we
remove the selection
(shortcuts_add_bookmarks): ditto
Mon Mar 15 10:47:18 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilechooserentry.c: s/seperator/separator/.

View File

@ -1,3 +1,10 @@
Mon Mar 15 10:35:19 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
changing_folders to be true so we don't trigger a callback when we
remove the selection
(shortcuts_add_bookmarks): ditto
Mon Mar 15 10:47:18 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilechooserentry.c: s/seperator/separator/.

View File

@ -1,3 +1,10 @@
Mon Mar 15 10:35:19 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
changing_folders to be true so we don't trigger a callback when we
remove the selection
(shortcuts_add_bookmarks): ditto
Mon Mar 15 10:47:18 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilechooserentry.c: s/seperator/separator/.

View File

@ -1,3 +1,10 @@
Mon Mar 15 10:35:19 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set
changing_folders to be true so we don't trigger a callback when we
remove the selection
(shortcuts_add_bookmarks): ditto
Mon Mar 15 10:47:18 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilechooserentry.c: s/seperator/separator/.

View File

@ -1198,6 +1198,10 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
int start_row;
GSList *list, *l;
int n;
gboolean old_changing_folders;
old_changing_folders = impl->changing_folder;
impl->changing_folder = TRUE;
start_row = shortcuts_get_index (impl, SHORTCUTS_VOLUMES);
shortcuts_remove_rows (impl, start_row, impl->num_volumes, volume_remove_cb);
@ -1232,6 +1236,8 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
if (impl->shortcuts_filter_model)
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
impl->changing_folder = old_changing_folders;
}
/* Used from shortcuts_remove_rows() */
@ -1268,6 +1274,10 @@ static void
shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
{
GSList *bookmarks;
gboolean old_changing_folders;
old_changing_folders = impl->changing_folder;
impl->changing_folder = TRUE;
if (impl->num_bookmarks > 0)
{
@ -1288,6 +1298,8 @@ shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
}
if (impl->shortcuts_filter_model)
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
impl->changing_folder = old_changing_folders;
}
/* Appends a separator and a row to the shortcuts list for the current folder */