Merge lp:~junrrein/pantheon-files/fix-1099164 into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

[Sidebar] Don't pop up a context menu when secondary-clicking over a category or blank space. Fixes bug #1099164.
Remove a duplicate include in src/View/ContextView.vala .

[David Gomes (davidgomes)]

+1.

review: Approve

=== modified file 'src/View/ContextView.vala'
--- src/View/ContextView.vala	2012-11-06 20:18:52 +0000
+++ src/View/ContextView.vala	2013-01-19 23:29:21 +0000
@@ -25,7 +25,6 @@
 using Cairo;
 using Gee;
 using Granite.Widgets;
-using Granite.Widgets;
 
 namespace Marlin.View {
 

=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c	2013-01-09 09:17:37 +0000
+++ src/marlin-places-sidebar.c	2013-01-19 23:29:21 +0000
@@ -2540,9 +2540,6 @@
     if (event->window != gtk_tree_view_get_bin_window (tree_view))
         return TRUE;
 
-    if (event->button == 3) {
-        bookmarks_popup_menu (sidebar, event);
-    } else {
         GtkTreeModel *model;
         GtkTreePath *path;
 
@@ -2571,16 +2568,14 @@
             break;
 
         case GDK_BUTTON_SECONDARY:
-            open_selected_bookmark (sidebar, model, path,
-                                    event->state & GDK_CONTROL_MASK ?
-                                    MARLIN_WINDOW_OPEN_FLAG_NEW_WINDOW :
-                                    MARLIN_WINDOW_OPEN_FLAG_NEW_TAB);
+            if (path != NULL)
+                if (!category_at_path (path))   
+                    bookmarks_popup_menu (sidebar, event);
             break;
         }
 
         if (path != NULL)
             gtk_tree_path_free (path);
-    }
 
     return FALSE;
 }