aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-tree.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-09-28 01:48:23 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-09-28 01:48:23 +0800
commit54d4e5e5f8ae9b2273377b1030a9822b4faecba2 (patch)
tree688034c8ef27aa7a6cab63e339e69e90e6e19249 /mail/em-folder-tree.c
parent80dd682b542b9740670abcb9470185b7db8d49b8 (diff)
downloadgsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.tar.gz
gsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.tar.zst
gsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.zip
** Fixes bug #477045
2007-09-27 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #477045 * addressbook/gui/component/addressbook-component.c: * addressbook/gui/component/addressbook-view.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/gui/widgets/eab-contact-display.c: * calendar/gui/calendar-commands.c: * calendar/gui/calendar-component.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/comp-editor.c: * calendar/gui/dialogs/event-editor.c: * calendar/gui/dialogs/task-editor.c: * calendar/gui/e-cal-popup.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-day-view.c: * calendar/gui/e-memo-table.c: * calendar/gui/e-week-view.c: * calendar/gui/memos-component.c: * calendar/gui/memos-control.c: * calendar/gui/tasks-component.c: * calendar/gui/tasks-control.c: * composer/e-msg-composer-select-file.c: * composer/e-msg-composer.c: * mail/em-folder-tree.c: * mail/em-folder-view.c: * mail/em-popup.c: * mail/mail-component.c: * mail/mail-mt.c: * mail/mail-send-recv.c: * mail/message-list.c: * plugins/exchange-folder-permission.c: * plugins/exchange-folder.c: * plugins/groupwise-features/share-folder-common.c: * shell/e-shell-window-commands.c: * ui/evolution-addressbook.xml: * ui/evolution-calendar.xml: * ui/evolution-composer-entries.xml: * ui/evolution-editor.xml: * ui/evolution-event-editor.xml: * ui/evolution-mail-list.xml: * ui/evolution-mail-message.xml: * ui/evolution-memos.xml: * ui/evolution-message-composer.xml: * ui/evolution-subscribe.xml: * ui/evolution-task-editor.xml: * ui/evolution-tasks.xml: * ui/evolution.xml: Use standard icon names where applicable. svn path=/trunk/; revision=34322
Diffstat (limited to 'mail/em-folder-tree.c')
-rw-r--r--mail/em-folder-tree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index fa0955a832..b04fecf272 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
guint32 flags;
if (!initialised) {
- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU);
@@ -988,7 +988,7 @@ static EPopupItem emft_drop_popup_menu[] = {
{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
{ E_POPUP_BAR, "10.emc" },
- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 },
+ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
};
static void
@@ -2104,12 +2104,12 @@ static EPopupItem emft_popup_items[] = {
{ E_POPUP_BAR, "20.emc" },
/* FIXME: need to disable for nochildren folders */
- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS },
+ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
/* FIXME: need to disable for undeletable folders */
- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
{ E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
+ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
+ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
{ E_POPUP_BAR, "80.emc" },