From aa42a0d33df33a72bd03b2b69467c59ae405cae4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 9 May 2007 14:54:15 +0100 Subject: Add bookmarks when in non-browse mode Make bookmarks_add_selected_folder() helper use the different models used by the different operation modes and allow adding bookmarks to folders when in OPERATION_MODE_SEARCH and OPERATION_MODE_RECENT. Signed-off-by: Emmanuele Bassi --- gtk/gtkfilechooserdefault.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index e04acdf..31f7746 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2636,10 +2636,27 @@ add_bookmark_foreach_cb (GtkTreeModel *model, impl = (GtkFileChooserDefault *) data; - fs_model = impl->browse_files_model; - gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, iter); + switch (impl->operation_mode) + { + case OPERATION_MODE_BROWSE: + fs_model = impl->browse_files_model; + gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, iter); + file_path = _gtk_file_system_model_get_path (fs_model, &child_iter); + break; - file_path = _gtk_file_system_model_get_path (fs_model, &child_iter); + case OPERATION_MODE_SEARCH: + gtk_tree_model_get (GTK_TREE_MODEL (impl->search_model), iter, + SEARCH_MODEL_COL_PATH, &file_path, + -1); + break; + + case OPERATION_MODE_RECENT: + gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_model), iter, + RECENT_MODEL_COL_PATH, &file_path, + -1); + break; + } + shortcuts_add_bookmark_from_path (impl, file_path, -1); } -- 1.4.4.2