[nautilus/gnome-2-32-fixes: 2/4] Don't check for the eject button if the row doesn't have it (#628347)

[Cosimo Cecchi <cosimoc src gnome org>]

commit 0bfcaf2983c61b40701692d6797c737bc9360615
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Sep 17 19:28:27 2010 +0200

    Don't check for the eject button if the row doesn't have it (#628347)
    
    This sometimes caused false positives in the click-on-eject-button
    detection method.

 src/nautilus-places-sidebar.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 49ff2ef..3aace22 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -697,13 +697,27 @@ clicked_eject_button (NautilusPlacesSidebar *sidebar,
 	GtkTextDirection direction;
 	int width, total_width;
 	int eject_button_size;
+	gboolean show_eject;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
 
 	*path = NULL;
+	model = gtk_tree_view_get_model (sidebar->tree_view);
 
 	if ((event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) &&
 	    gtk_tree_view_get_path_at_pos (sidebar->tree_view,
 					   button_event->x, button_event->y,
 					   path, &column, NULL, NULL)) {
+
+		gtk_tree_model_get_iter (model, &iter, *path);
+		gtk_tree_model_get (model, &iter,
+				    PLACES_SIDEBAR_COLUMN_EJECT, &show_eject,
+				    -1);
+
+		if (!show_eject) {
+			goto out;
+		}
+
 		total_width = 0;
 
 		gtk_widget_style_get (GTK_WIDGET (sidebar->tree_view),
@@ -734,6 +748,7 @@ clicked_eject_button (NautilusPlacesSidebar *sidebar,
 		}
 	}
 
+ out:
 	if (*path != NULL) {
 		gtk_tree_path_free (*path);
 	}