From 5d3feae6af63bbe30a0c5672b82415ada9cad98a Mon Sep 17 00:00:00 2001 From: Yousuf Philips Date: Tue, 10 Mar 2020 23:04:12 +0400 Subject: [PATCH] Change menu tooltip and use the predefined sorting (Bug #16472) Fixed up the comments a bit as well --- thunar/thunar-shortcuts-model.c | 3 +-- thunar/thunar-window.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index ac482615..8cb8abe7 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -1074,10 +1074,9 @@ thunar_shortcuts_model_shortcut_places (ThunarShortcutsModel *model) if (file != NULL) { shortcut = g_slice_new0 (ThunarShortcut); - shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_DEFAULT; + shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_COMPUTER; shortcut->name = g_strdup (_("Computer")); shortcut->file = file; - shortcut->sort_id = -1; shortcut->gicon = g_themed_icon_new ("computer"); shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut); thunar_shortcuts_model_add_shortcut (model, shortcut); diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index 945d864e..7473a264 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -378,7 +378,7 @@ static GtkActionEntry action_entries[] = { "open-parent", "go-up-symbolic", N_ ("Open _Parent"), "Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), }, { "open-home", "go-home-symbolic", N_ ("_Home"), "Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), }, { "open-desktop", "user-desktop", N_ ("Desktop"), NULL, N_ ("Go to the desktop folder"), G_CALLBACK (thunar_window_action_open_desktop), }, - { "open-computer", "computer", N_ ("Computer"), NULL, N_ ("Go to the computer folder"), G_CALLBACK (thunar_window_action_open_computer), }, + { "open-computer", "computer", N_ ("Computer"), NULL, N_ ("Browse all local and remote disks and folders accessible from this computer"), G_CALLBACK (thunar_window_action_open_computer), }, { "open-file-system", "drive-harddisk", N_ ("File System"), NULL, N_ ("Browse the file system"), G_CALLBACK (thunar_window_action_open_file_system), }, { "open-network", "network-workgroup", N_("B_rowse Network"), NULL, N_ ("Browse local network connections"), G_CALLBACK (thunar_window_action_open_network), }, { "open-templates", "text-x-generic-template", N_("T_emplates"), NULL, N_ ("Go to the templates folder"), G_CALLBACK (thunar_window_action_open_templates), }, @@ -3107,10 +3107,10 @@ thunar_window_action_open_computer (GtkAction *action, _thunar_return_if_fail (THUNAR_IS_WINDOW (window)); - /* determine the path to the computer directory */ + /* determine the computer location */ computer = thunar_g_file_new_for_computer (); - /* determine the file for the computer directory */ + /* determine the file for this location */ computer_file = thunar_file_get (computer, &error); if (G_UNLIKELY (computer_file == NULL)) { @@ -3120,7 +3120,7 @@ thunar_window_action_open_computer (GtkAction *action, } else { - /* open the computer folder */ + /* release our reference on the location itself */ thunar_window_set_current_directory (window, computer_file); g_object_unref (G_OBJECT (computer_file)); } -- 2.17.1