diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c index d6b22b9..c2268c4 100644 --- a/plugins/thunar-tpa/thunar-tpa-icon.c +++ b/plugins/thunar-tpa/thunar-tpa-icon.c @@ -167,7 +167,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon) gtk_widget_show (icon->button); /* setup the image for the trash icon */ - icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON); + icon->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (icon->button), icon->image); gtk_widget_show (icon->image); @@ -276,7 +276,7 @@ thunar_tpa_icon_state (ThunarTpaIcon *icon, gtk_widget_set_tooltip_text (icon->button, full ? _("Trash contains files") : _("Trash is empty")); /* setup the appropriate icon */ - gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON); + gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON); /* apply the new state */ icon->full = full; diff --git a/plugins/thunar-tpa/thunar-tpa.desktop.in.in b/plugins/thunar-tpa/thunar-tpa.desktop.in.in index 6d848f6..f647521 100644 --- a/plugins/thunar-tpa/thunar-tpa.desktop.in.in +++ b/plugins/thunar-tpa/thunar-tpa.desktop.in.in @@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin Encoding=UTF-8 _Name=Trash Applet _Comment=Display the trash can -Icon=gnome-fs-trash-empty +Icon=user-trash X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index dc12c08..ec1b178 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -1282,7 +1282,7 @@ thunar_application_copy_to (ThunarApplication *application, _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); /* launch the operation */ - thunar_application_launch (application, parent, "stock_folder-copy", + thunar_application_launch (application, parent, "gtk-copy", _("Copying files..."), thunar_io_jobs_copy_files, source_file_list, target_file_list, new_files_closure); } @@ -1323,7 +1323,7 @@ thunar_application_copy_into (ThunarApplication *application, g_free (display_name); /* collect the target files and launch the job */ - thunar_application_collect_and_launch (application, parent, "stock_folder-copy", + thunar_application_collect_and_launch (application, parent, "gtk-copy", title, thunar_io_jobs_copy_files, source_file_list, target_file, new_files_closure); @@ -1369,7 +1369,7 @@ thunar_application_link_into (ThunarApplication *application, g_free (display_name); /* collect the target files and launch the job */ - thunar_application_collect_and_launch (application, parent, "stock_link", + thunar_application_collect_and_launch (application, parent, "insert-link", title, thunar_io_jobs_link_files, source_file_list, target_file, new_files_closure); @@ -1423,7 +1423,7 @@ thunar_application_move_into (ThunarApplication *application, /* collect the target files and launch the job */ thunar_application_collect_and_launch (application, parent, - "stock_folder-move", title, + "folder-move", title, thunar_io_jobs_move_files, source_file_list, target_file, new_files_closure); @@ -1537,7 +1537,7 @@ thunar_application_unlink_files (ThunarApplication *application, if (G_LIKELY (response == GTK_RESPONSE_YES)) { /* launch the "Delete" operation */ - thunar_application_launch (application, parent, "stock_delete", + thunar_application_launch (application, parent, "edit-delete", _("Deleting files..."), unlink_stub, path_list, path_list, NULL); } @@ -1572,7 +1572,7 @@ thunar_application_trash (ThunarApplication *application, _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); _thunar_return_if_fail (file_list != NULL); - thunar_application_launch (application, parent, "gnome-fs-trash-full", + thunar_application_launch (application, parent, "user-trash-full", _("Moving files into the trash..."), trash_stub, file_list, NULL, NULL); } @@ -1611,7 +1611,7 @@ thunar_application_creat (ThunarApplication *application, _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); /* launch the operation */ - thunar_application_launch (application, parent, "stock_new", + thunar_application_launch (application, parent, "document-new", _("Creating files..."), creat_stub, file_list, file_list, new_files_closure); } @@ -1650,7 +1650,7 @@ thunar_application_mkdir (ThunarApplication *application, _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); /* launch the operation */ - thunar_application_launch (application, parent, "stock_folder", + thunar_application_launch (application, parent, "folder-new", _("Creating directories..."), mkdir_stub, file_list, file_list, new_files_closure); } @@ -1714,7 +1714,7 @@ thunar_application_empty_trash (ThunarApplication *application, file_list.prev = NULL; /* launch the operation */ - thunar_application_launch (application, parent, "gnome-fs-trash-empty", + thunar_application_launch (application, parent, "user-trash", _("Emptying the Trash..."), unlink_stub, &file_list, NULL, NULL); @@ -1785,7 +1785,7 @@ thunar_application_restore_files (ThunarApplication *application, else { /* launch the operation */ - thunar_application_launch (application, parent, "stock_folder-move", + thunar_application_launch (application, parent, "folder-move", _("Restoring files..."), thunar_io_jobs_restore_files, source_path_list, target_path_list, new_files_closure); } diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c index fecaac4..ae55dba 100644 --- a/thunar/thunar-dialogs.c +++ b/thunar/thunar-dialogs.c @@ -586,7 +586,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent, gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); - image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_BUTTON); gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f); gtk_misc_set_padding (GTK_MISC (image), 6, 6); gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c index 6d60501..ef17d1b 100644 --- a/thunar/thunar-dnd.c +++ b/thunar/thunar-dnd.c @@ -69,7 +69,7 @@ thunar_dnd_ask (GtkWidget *widget, { static const GdkDragAction dnd_action_items[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK }; static const gchar *dnd_action_names[] = { N_ ("_Copy here"), N_ ("_Move here"), N_ ("_Link here") }; - static const gchar *dnd_action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL }; + static const gchar *dnd_action_icons[] = { "gtk-copy", "folder-move", NULL }; ThunarxProviderFactory *factory; GdkDragAction dnd_action = 0; diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c index 9586ed1..c777b5f 100644 --- a/thunar/thunar-stock.c +++ b/thunar/thunar-stock.c @@ -45,12 +45,12 @@ typedef struct /* keep in sync with thunar-stock.h */ static const ThunarStockIcon thunar_stock_icons[] = { - { THUNAR_STOCK_DESKTOP, "gnome-fs-desktop", }, - { THUNAR_STOCK_HOME, "gnome-fs-home", }, + { THUNAR_STOCK_DESKTOP, "user-desktop", }, + { THUNAR_STOCK_HOME, "user-home", }, { THUNAR_STOCK_SHORTCUTS, "stock_thunar-shortcuts", }, - { THUNAR_STOCK_TEMPLATES, "stock_thunar-templates", }, - { THUNAR_STOCK_TRASH_EMPTY, "gnome-fs-trash-empty", }, - { THUNAR_STOCK_TRASH_FULL, "gnome-fs-trash-full", }, + { THUNAR_STOCK_TEMPLATES, "text-x-generic-template", }, + { THUNAR_STOCK_TRASH_EMPTY, "user-trash", }, + { THUNAR_STOCK_TRASH_FULL, "user-trash-full", }, { THUNAR_STOCK_DOWNLOADS, "emblem-downloads", }, { THUNAR_STOCK_DOCUMENTS, "emblem-documents", }, { THUNAR_STOCK_MUSIC, "audio-x-generic", }, diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h index 9fa3b6e..b2682d8 100644 --- a/thunar/thunar-stock.h +++ b/thunar/thunar-stock.h @@ -26,9 +26,9 @@ G_BEGIN_DECLS; #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-empty" /* see ThunarTrashAction */ +#define THUNAR_STOCK_TRASH_EMPTY "thunar-trash" /* see ThunarTrashAction */ #define THUNAR_STOCK_TRASH_FULL "thunar-trash-full" /* see ThunarTrashAction */ -#define THUNAR_STOCK_DIRECTORY "gnome-fs-directory" +#define THUNAR_STOCK_DIRECTORY "gtk-directory" #define THUNAR_STOCK_DOWNLOADS "thunar-downloads" #define THUNAR_STOCK_DOCUMENTS "thunar-documents" #define THUNAR_STOCK_MUSIC "thunar-music"