Patch from Michael Monreal <michael.monreal@gmx.net>: Fix for bug #492188 (Use the new Tangoized icons instead of the deprecated ones from gnome-icon-theme)

M    addressbook/gui/component/addressbook-view.c
M    addressbook/ChangeLog
AM   data/icons/hicolor_actions_16x16_mail-move.png
AM   data/icons/hicolor_actions_16x16_mail-copy.png
AM   data/icons/hicolor_actions_16x16_folder-move.png
M    data/icons/Makefile.am
AM   data/icons/hicolor_actions_16x16_folder-copy.png
M    mail/em-folder-browser.c
M    mail/ChangeLog
M    mail/em-folder-tree.c
M    mail/em-folder-view.c
M    mail/message-list.c
M    composer/ChangeLog
M    composer/e-msg-composer.c
M    ChangeLog
M    calendar/gui/dialogs/comp-editor.c
M    calendar/ChangeLog

svn path=/trunk/; revision=34769

17 files changed, 71 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index a0d65eb497..69a2a66724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
+
+	** Fix for bug #492188
+
+	* data/icons/Makefile.am:
+
+	Use the new Tangoized icons instead of deprecated icons from 
+	gnome-icon-theme.
+
 2008-01-05  Matthew Barnes  <mbarnes@redhat.com>
 
 	* data/evolution.desktop.in.in:
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f3bf0ae114..e2e91e36e0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
+
+	** Fix for bug #492188
+
+	* gui/component/addressbook-view.c:
+
+	Use the new Tangoized icons instead of deprecated icons from 
+	gnome-icon-theme.
+
 2008-01-06  Christian Krause  <chkr@plauener.de>
 
 	** Fix for bug #506772
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 8d27b27f53..d58b7400aa 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -626,7 +626,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-message-new", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU),
 
 	E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 80890db381..13918e0985 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
+
+	** Fix for bug #492188
+
+	* gui/dialogs/comp-editor.c:
+
+	Use the new Tangoized icons instead of deprecated icons from 
+	gnome-icon-theme.
+
 2008-01-03  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #270605
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ce2ae3b69a..6ddfdb6719 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -460,8 +460,8 @@ drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
 }
 
 static EPopupItem drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "stock_mail-copy", 0 },
-	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "stock_mail-move", 0 },
+	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "mail-copy", 0 },
+	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "mail-move", 0 },
 	{ E_POPUP_BAR, "10.emc" },
 	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), drop_popup_cancel, NULL, NULL, 0 },
 };
diff --git a/composer/ChangeLog b/composer/ChangeLog
index df338f848b..78ffb87d10 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
+
+	** Fix for bug #492188
+
+	* e-msg-composer.c:
+
+	Use the new Tangoized icons instead of deprecated icons from 
+	gnome-icon-theme.
+
 2008-01-02  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #364642
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a2a4973d0d..ad049994ba 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3100,8 +3100,8 @@ drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
 }
 
 static EPopupItem drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "stock_mail-copy", 0 },
-	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "stock_mail-move", 0 },
+	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), drop_popup_copy, NULL, "mail-copy", 0 },
+	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), drop_popup_move, NULL, "mail-move", 0 },
 	{ E_POPUP_BAR, "10.emc" },
 	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), drop_popup_cancel, NULL, NULL, 0 },
 };
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 21a8b91488..9ee916abd1 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -10,6 +10,10 @@ public_icons = \
 	$(NULL)
 
 private_icons = \
+	hicolor_actions_16x16_folder-copy.png \
+	hicolor_actions_16x16_folder-move.png \
+	hicolor_actions_16x16_mail-copy.png \
+	hicolor_actions_16x16_mail-move.png \
  	hicolor_actions_16x16_go-today.png \
 	hicolor_actions_16x16_view-calendar-day.png \
 	hicolor_actions_16x16_view-calendar-list.png \
diff --git a/data/icons/hicolor_actions_16x16_folder-copy.png b/data/icons/hicolor_actions_16x16_folder-copy.png
new file mode 100644
index 0000000000..603b5c4082
--- /dev/null
+++ b/data/icons/hicolor_actions_16x16_folder-copy.png
diff --git a/data/icons/hicolor_actions_16x16_folder-move.png b/data/icons/hicolor_actions_16x16_folder-move.png
new file mode 100644
index 0000000000..b3f64f9272
--- /dev/null
+++ b/data/icons/hicolor_actions_16x16_folder-move.png
diff --git a/data/icons/hicolor_actions_16x16_mail-copy.png b/data/icons/hicolor_actions_16x16_mail-copy.png
new file mode 100644
index 0000000000..dd54a523c7
--- /dev/null
+++ b/data/icons/hicolor_actions_16x16_mail-copy.png
diff --git a/data/icons/hicolor_actions_16x16_mail-move.png b/data/icons/hicolor_actions_16x16_mail-move.png
new file mode 100644
index 0000000000..8f9eea4c5f
--- /dev/null
+++ b/data/icons/hicolor_actions_16x16_mail-move.png
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f78fcdc96c..06746ba2e4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-06  Michael Monreal  <michael.monreal@gmx.net>
+
+	** Fix for bug #492188
+
+	* em-folder-browser.c:
+	* em-folder-tree.c:
+	* em-folder-view.c:
+	* message-list.c:
+
+	Use the new Tangoized icons instead of deprecated icons from 
+	gnome-icon-theme.
+
 2008-01-02  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #317823
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index f44a0e4648..521f7df518 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1655,8 +1655,8 @@ static BonoboUIVerb emfb_verbs[] = {
 
 static EPixmap emfb_pixmaps[] = {
 	E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FolderCopy", "folder-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAllAsRead", "mail-read", E_ICON_SIZE_MENU),
 
 	E_PIXMAP_END
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 03475e51e8..a0af89920f 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1010,8 +1010,8 @@ emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
 static EPopupItem emft_drop_popup_menu[] = {
 	{ E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 },
 	{ E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 },
-	{ 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_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "folder-copy", 2 },
+	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "folder-move", 2 },
 	{ E_POPUP_BAR, "10.emc" },
 	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
 };
@@ -2099,8 +2099,8 @@ static EPopupItem emft_popup_items[] = {
 	/* FIXME: need to disable for nochildren folders */
 	{ E_POPUP_ITEM, "10.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
 
-	{ E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT },
-	{ E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT },
+	{ E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
 
 	/* FIXME: need to disable for undeletable folders */
 	{ E_POPUP_BAR,  "20.emc" },
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 85d7334dcb..1758735ab3 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1326,8 +1326,8 @@ static EPopupItem emfv_popup_items[] = {
 	{ E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
 	{ E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
 
 	{ E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL },
 	{ E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -2089,7 +2089,7 @@ static EPixmap emfv_message_pixmaps[] = {
 	E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageCopy", "mail-copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU),
@@ -2099,7 +2099,7 @@ static EPixmap emfv_message_pixmaps[] = {
 	E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsRead", "mail-mark-read", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-mark-unread", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageMove", "mail-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU),
@@ -2117,8 +2117,8 @@ static EPixmap emfv_message_pixmaps[] = {
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "mail-move", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR),
diff --git a/mail/message-list.c b/mail/message-list.c
index 94f60a18ae..6920141b27 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2054,8 +2054,8 @@ ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data)
 }
 
 static EPopupItem ml_drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "stock_folder-copy", 0 },
-	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "stock_folder-move", 0 },
+	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "folder-copy", 0 },
+	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "folder-move", 0 },
 	{ E_POPUP_BAR, "10.emc" },
 	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 },
 };