[Xfce4-commits] <thunar:master> Use stock home icons for ~.

[Nick Schermer]

Updating branch refs/heads/master
         to 331aaee90d111555e4da5fa7f5be52cc5cfb3bd6 (commit)
       from 877b8ea466ab74b2386af92b1ffe707c97a749a2 (commit)

commit 331aaee90d111555e4da5fa7f5be52cc5cfb3bd6
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Nov 8 21:15:28 2012 +0100

    Use stock home icons for ~.

 thunar/thunar-file.c            |    3 +++
 thunar/thunar-shortcuts-model.c |    1 +
 thunar/thunar-stock.c           |    1 -
 thunar/thunar-stock.h           |    1 -
 thunar/thunar-window.c          |    2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 9f4fe72..f82571b 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3324,6 +3324,9 @@ thunar_file_get_icon_name (const ThunarFile   *file,
       return g_strdup ("drive-harddisk");
     }
 
+  if (thunar_file_is_home (file))
+    return g_strdup (GTK_STOCK_HOME);
+
   if (file->info == NULL)
     return NULL;
 
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 51cce29..bbdf396 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -885,6 +885,7 @@ thunar_shortcuts_model_shortcut_places (ThunarShortcutsModel *model)
       shortcut = g_slice_new0 (ThunarShortcut);
       shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_DEFAULT;
       shortcut->file = file;
+      shortcut->gicon = g_themed_icon_new (GTK_STOCK_HOME);
       shortcut->sort_id = 0;
       shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
       thunar_shortcuts_model_add_shortcut (model, shortcut);
diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
index e6ad229..48b0e89 100644
--- a/thunar/thunar-stock.c
+++ b/thunar/thunar-stock.c
@@ -46,7 +46,6 @@ typedef struct
 static const ThunarStockIcon thunar_stock_icons[] =
 {
   { THUNAR_STOCK_DESKTOP,     "user-desktop" },
-  { THUNAR_STOCK_HOME,        "go-home" },
   { THUNAR_STOCK_SHORTCUTS,   "stock_thunar-shortcuts" },
   { THUNAR_STOCK_TEMPLATES,   "text-x-generic-template" },
   { THUNAR_STOCK_TRASH_EMPTY, "user-trash",   },
diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
index 8a68dd1..036ee3c 100644
--- a/thunar/thunar-stock.h
+++ b/thunar/thunar-stock.h
@@ -23,7 +23,6 @@
 G_BEGIN_DECLS;
 
 #define THUNAR_STOCK_DESKTOP      "thunar-desktop"      /* see ThunarLauncher */
-#define THUNAR_STOCK_HOME         "thunar-home"         /* see ThunarWindow */
 #define THUNAR_STOCK_SHORTCUTS    "thunar-shortcuts"    /* see ThunarShortcutsPane */
 #define THUNAR_STOCK_TEMPLATES    "thunar-templates"    /* see ThunarWindow */
 #define THUNAR_STOCK_TRASH_EMPTY  "thunar-trash"        /* see ThunarTrashAction */
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index a7db93d..aaf9674 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -352,7 +352,7 @@ static GtkActionEntry action_entries[] =
   { "zoom-reset", GTK_STOCK_ZOOM_100, N_ ("Normal Si_ze"), "<control>0", N_ ("Show the contents at the normal size"), G_CALLBACK (thunar_window_action_zoom_reset), },
   { "go-menu", NULL, N_ ("_Go"), NULL, },
   { "open-parent", GTK_STOCK_GO_UP, N_ ("Open _Parent"), "<alt>Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), },
-  { "open-home", THUNAR_STOCK_HOME, N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), },
+  { "open-home", GTK_STOCK_HOME, N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), },
   { "open-desktop", THUNAR_STOCK_DESKTOP, "Desktop", NULL, N_ ("Go to the desktop folder"), G_CALLBACK (thunar_window_action_open_desktop), },
   { "open-file-system", GTK_STOCK_HARDDISK, N_ ("File System"), NULL, N_ ("Browse the file system"), G_CALLBACK (thunar_window_action_open_file_system), },
   { "open-network", GTK_STOCK_NETWORK, N_("B_rowse Network"), NULL, N_ ("Browse local network connections"), G_CALLBACK (thunar_window_action_open_network), },