[Xfce4-commits] [xfce/thunar] 04/13: Revert workaround for desktop toplevel item in the tree view

noreply at xfce.org noreply at xfce.org
Tue May 12 09:58:17 CEST 2015


This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/thunar.

commit a920087f9dae42b45d18e48e1a772458efbb9c39
Author: Harald Judt <h.judt at gmx.at>
Date:   Sat May 9 12:54:55 2015 +0200

    Revert workaround for desktop toplevel item in the tree view
    
    Since the toplevel item issue is fixed now, this is no longer necessary
    and can be reverted.
---
 thunar/thunar-tree-view.c |   30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 06ef997..5312bc6 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -805,35 +805,7 @@ thunar_tree_view_key_press_event(GtkWidget   *widget,
       /* sync with new tree view selection */
       gtk_tree_path_free (path);
       gtk_tree_view_get_cursor (GTK_TREE_VIEW (tree_view), &path, NULL);
-
-      /* The top-level desktop entry is a bit problematic; opening it
-         will usually cause expansion of the home directory where the
-         desktop folder resides. This breaks navigation and is bad for
-         user experience, so do not open the top-level desktop entry
-         automatically.
-       */
-      if (gtk_tree_path_get_depth (path) == 1)
-        {
-          ThunarFile *file;
-          GFile *desktop;
-          GFile *selected;
-
-          file = thunar_tree_view_get_selected_file (tree_view);
-          if (file)
-            {
-              desktop = thunar_g_file_new_for_desktop ();
-              selected = thunar_file_get_file (file);
-
-              /* open only non-desktop top-level items */
-              if (! g_file_equal (desktop, selected))
-                  thunar_tree_view_action_open (tree_view);
-
-              g_object_unref (G_OBJECT (file));
-              g_object_unref (desktop);
-            }
-        }
-      else
-          thunar_tree_view_action_open (tree_view);
+      thunar_tree_view_action_open (tree_view);
 
       stopPropagation = TRUE;
       break;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list