summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2013-09-20 21:13:31 -0500
committerFederico Mena Quintero <federico@gnome.org>2013-09-20 21:14:00 -0500
commit1e5dde7eabbc77e85a095cda284706af8cd3739d (patch)
tree00a0e83201e5d272bf258bd2479aceddae3df21a
parent9f3627cd7c17adc758159eaf06ac651c3c40ced4 (diff)
downloadgtk+-1e5dde7eabbc77e85a095cda284706af8cd3739d.tar.gz
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 <federico@gnome.org>
-rw-r--r--gtk/gtkplacessidebar.c9
1 files 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) {