[nautilus/gnome-3-8] places-sidebar: don't call open_selected_bookmark () when ejecting

[Cosimo Cecchi <cosimoc src gnome org>]

commit d5c09af0d7052b778e295ece5b4bdda71b779383
Author: Joshua Lock <joshua lock intel com>
Date:   Thu Jul 11 21:43:09 2013 +0100

    places-sidebar: don't call open_selected_bookmark () when ejecting
    
    This prevents nautilus trying to switch to the place which is being ejected
    and in turn showing an error.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699183

 src/nautilus-places-sidebar.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 774739a..a487d90 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -2924,13 +2924,18 @@ bookmarks_row_activated_cb (GtkWidget *widget,
                            NautilusPlacesSidebar *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