This is an automated email from the git hooks/post-receive script. hjudt pushed a commit to branch master in repository xfce/thunar.
commit eaeb66a587de0e9cc79c3ff902949877eedf6d32 Author: Jani Välimaa <wa...@mageia.org> Date: Fri Feb 27 08:57:19 2015 -0600 Fix some GTK_STOCK icon usages resulting in missing icons (bug #11608) Signed-off-by: Robby Workman <rwork...@slackware.com> --- thunar/thunar-history.c | 2 +- thunar/thunar-icon-factory.c | 2 +- thunar/thunar-location-entry.c | 2 +- thunar/thunar-shortcuts-model.c | 6 +++--- thunar/thunar-window.c | 26 +++++++++++++------------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c index ded855c..c6dbb82 100644 --- a/thunar/thunar-history.c +++ b/thunar/thunar-history.c @@ -661,7 +661,7 @@ thunar_history_show_menu (GtkAction *action, else if (thunar_g_file_is_root (lp->data)) icon_name = "drive-harddisk"; else - icon_name = GTK_STOCK_DIRECTORY; + icon_name = "folder"; image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); } diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c index 96d783d..d660dc0 100644 --- a/thunar/thunar-icon-factory.c +++ b/thunar/thunar-icon-factory.c @@ -599,7 +599,7 @@ static GdkPixbuf* thunar_icon_factory_load_fallback (ThunarIconFactory *factory, gint size) { - return thunar_icon_factory_lookup_icon (factory, GTK_STOCK_FILE, size, FALSE); + return thunar_icon_factory_lookup_icon (factory, "text-x-generic", size, FALSE); } diff --git a/thunar/thunar-location-entry.c b/thunar/thunar-location-entry.c index f702ffb..a695274 100644 --- a/thunar/thunar-location-entry.c +++ b/thunar/thunar-location-entry.c @@ -190,7 +190,7 @@ thunar_location_entry_init (ThunarLocationEntry *location_entry) /* put reload button in entry */ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (location_entry->path_entry), - GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_REFRESH); + GTK_ENTRY_ICON_SECONDARY, "view-refresh"); gtk_entry_set_icon_tooltip_text (GTK_ENTRY (location_entry->path_entry), GTK_ENTRY_ICON_SECONDARY, _("Reload the current folder")); g_signal_connect (G_OBJECT (location_entry->path_entry), "icon-release", diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index 5dce97d..8a1bdc3 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -895,7 +895,7 @@ thunar_shortcuts_model_shortcut_devices (ThunarShortcutsModel *model) shortcut->group = THUNAR_SHORTCUT_GROUP_DEVICES_FILESYSTEM; shortcut->name = g_strdup (_("File System")); shortcut->file = thunar_file_get_for_uri ("file:///", NULL); - shortcut->gicon = g_themed_icon_new (GTK_STOCK_HARDDISK); + shortcut->gicon = g_themed_icon_new ("drive-harddisk"); shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut); thunar_shortcuts_model_add_shortcut (model, shortcut); @@ -937,7 +937,7 @@ thunar_shortcuts_model_shortcut_network (ThunarShortcutsModel *model) shortcut->group = THUNAR_SHORTCUT_GROUP_NETWORK_DEFAULT; shortcut->name = g_strdup (_("Browse Network")); shortcut->location = g_file_new_for_uri ("network://"); - shortcut->gicon = g_themed_icon_new (GTK_STOCK_NETWORK); + shortcut->gicon = g_themed_icon_new ("network-workgroup"); shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut); thunar_shortcuts_model_add_shortcut (model, shortcut); } @@ -969,7 +969,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->gicon = g_themed_icon_new ("go-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-window.c b/thunar/thunar-window.c index 94a566f..0221881 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -351,28 +351,28 @@ static GtkActionEntry action_entries[] = { "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), }, { "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), }, { "close-all-windows", NULL, N_ ("Close _All Windows"), "<control><shift>W", N_ ("Close all Thunar windows"), G_CALLBACK (thunar_window_action_close_all_windows), }, - { "close-tab", GTK_STOCK_CLOSE, N_ ("C_lose Tab"), "<control>W", N_ ("Close this folder"), G_CALLBACK (thunar_window_action_close_tab), }, - { "close-window", GTK_STOCK_QUIT, N_ ("_Close Window"), "<control>Q", N_ ("Close this window"), G_CALLBACK (thunar_window_action_close_window), }, + { "close-tab", "window-close", N_ ("C_lose Tab"), "<control>W", N_ ("Close this folder"), G_CALLBACK (thunar_window_action_close_tab), }, + { "close-window", "application-exit", N_ ("_Close Window"), "<control>Q", N_ ("Close this window"), G_CALLBACK (thunar_window_action_close_window), }, { "edit-menu", NULL, N_ ("_Edit"), NULL, }, - { "preferences", GTK_STOCK_PREFERENCES, N_ ("Pr_eferences..."), NULL, N_ ("Edit Thunars Preferences"), G_CALLBACK (thunar_window_action_preferences), }, + { "preferences", "preferences-system", N_ ("Pr_eferences..."), NULL, N_ ("Edit Thunars Preferences"), G_CALLBACK (thunar_window_action_preferences), }, { "view-menu", NULL, N_ ("_View"), NULL, }, - { "reload", GTK_STOCK_REFRESH, N_ ("_Reload"), "<control>R", N_ ("Reload the current folder"), G_CALLBACK (thunar_window_action_reload), }, + { "reload", "view-refresh", N_ ("_Reload"), "<control>R", N_ ("Reload the current folder"), G_CALLBACK (thunar_window_action_reload), }, { "view-location-selector-menu", NULL, N_ ("_Location Selector"), NULL, }, { "view-side-pane-menu", NULL, N_ ("_Side Pane"), NULL, }, - { "zoom-in", GTK_STOCK_ZOOM_IN, N_ ("Zoom I_n"), "<control>plus", N_ ("Show the contents in more detail"), G_CALLBACK (thunar_window_action_zoom_in), }, - { "zoom-out", GTK_STOCK_ZOOM_OUT, N_ ("Zoom _Out"), "<control>minus", N_ ("Show the contents in less detail"), G_CALLBACK (thunar_window_action_zoom_out), }, - { "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), }, + { "zoom-in", "zoom-in", N_ ("Zoom I_n"), "<control>plus", N_ ("Show the contents in more detail"), G_CALLBACK (thunar_window_action_zoom_in), }, + { "zoom-out", "zoom-out", N_ ("Zoom _Out"), "<control>minus", N_ ("Show the contents in less detail"), G_CALLBACK (thunar_window_action_zoom_out), }, + { "zoom-reset", "zoom-original", 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", GTK_STOCK_HOME, N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), }, + { "open-parent", "go-up", N_ ("Open _Parent"), "<alt>Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), }, + { "open-home", "go-home", N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), }, { "open-desktop", THUNAR_STOCK_DESKTOP, N_ ("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), }, + { "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", THUNAR_STOCK_TEMPLATES, N_("T_emplates"), NULL, N_ ("Go to the templates folder"), G_CALLBACK (thunar_window_action_open_templates), }, { "open-location", NULL, N_ ("_Open Location..."), "<control>L", N_ ("Specify a location to open"), G_CALLBACK (thunar_window_action_open_location), }, { "help-menu", NULL, N_ ("_Help"), NULL, }, - { "contents", GTK_STOCK_HELP, N_ ("_Contents"), "F1", N_ ("Display Thunar user manual"), G_CALLBACK (thunar_window_action_contents), }, - { "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, N_ ("Display information about Thunar"), G_CALLBACK (thunar_window_action_about), }, + { "contents", "help-browser", N_ ("_Contents"), "F1", N_ ("Display Thunar user manual"), G_CALLBACK (thunar_window_action_contents), }, + { "about", "help-about", N_ ("_About"), NULL, N_ ("Display information about Thunar"), G_CALLBACK (thunar_window_action_about), }, }; static const GtkToggleActionEntry toggle_action_entries[] = -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits