summaryrefslogtreecommitdiff
path: root/gtk/gtkplacessidebar.c
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@intel.com>2013-07-12 12:39:23 +0100
committerFederico Mena Quintero <federico@gnome.org>2013-09-19 18:05:49 -0500
commit24751cba8eb28ce7c0772196b389a7996840c9ef (patch)
tree44cb66fd0c5c8092d1e669e24b8ddebfb802d358 /gtk/gtkplacessidebar.c
parent7b7b8eaaff60eedc51fe9da6ab5e141863cf3752 (diff)
downloadgtk+-24751cba8eb28ce7c0772196b389a7996840c9ef.tar.gz
places sidebar: don't open a bookmark when clicking eject
Trying to open a bookmark which is being ejected is at best confusing. https://bugzilla.gnome.org/show_bug.cgi?id=704087
Diffstat (limited to 'gtk/gtkplacessidebar.c')
-rw-r--r--gtk/gtkplacessidebar.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 7e84cb4235..1fadbf5568 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -3265,13 +3265,18 @@ bookmarks_row_activated_cb (GtkWidget *widget,
GtkPlacesSidebar *sidebar)
{
GtkTreeIter iter;
+ GtkTreePath *clicked_path = NULL;
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
if (!gtk_tree_model_get_iter (model, &iter, path)) {
return;
}
- open_selected_bookmark (sidebar, model, &iter, 0);
+ if (!clicked_eject_button (sidebar, &clicked_path)) {
+ open_selected_bookmark (sidebar, model, &iter, 0);
+ } else {
+ gtk_tree_path_free (clicked_path);
+ }
}
static gboolean