From 1e5dde7eabbc77e85a095cda284706af8cd3739d Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 20 Sep 2013 21:13:31 -0500 Subject: [PATCH] places sidebar: Don't activate the bookmark if Eject was clicked This should really fix https://bugzilla.gnome.org/show_bug.cgi?id=704087 ... Signed-off-by: Federico Mena Quintero --- gtk/gtkplacessidebar.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 1fadbf5568..a019dcdde4 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -3265,18 +3265,13 @@ 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; } - if (!clicked_eject_button (sidebar, &clicked_path)) { - open_selected_bookmark (sidebar, model, &iter, 0); - } else { - gtk_tree_path_free (clicked_path); - } + open_selected_bookmark (sidebar, model, &iter, 0); } static gboolean @@ -3301,7 +3296,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget, eject_or_unmount_bookmark (sidebar, path); gtk_tree_path_free (path); - return FALSE; + return TRUE; } if (event->button == 1) {