diff --git a/evolution-2.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch
index ea4748e..1bc83ae 100644
--- a/evolution-2.11.92-icon-names.patch
+++ b/evolution-2.11.92-icon-names.patch
@@ -1,6 +1,6 @@
diff -up evolution-2.12.0/mail/em-folder-browser.c.icon-names evolution-2.12.0/mail/em-folder-browser.c
---- evolution-2.12.0/mail/em-folder-browser.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/em-folder-browser.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/em-folder-browser.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-browser.c 2007-10-09 09:42:51.000000000 -0400
@@ -206,7 +206,7 @@ enum {
/* Options for View */
static EMFBSearchBarItem emfb_view_items[] = {
@@ -25,9 +25,18 @@ diff -up evolution-2.12.0/mail/em-folder-browser.c.icon-names evolution-2.12.0/m
/* { NULL, 0, NULL }, */
/* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */
{{ NULL, -1, 0 }, NULL}
+@@ -1603,7 +1603,7 @@ static BonoboUIVerb emfb_verbs[] = {
+ };
+
+ static EPixmap emfb_pixmaps[] = {
+- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
++ 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),
+
diff -up evolution-2.12.0/mail/em-folder-tree.c.icon-names evolution-2.12.0/mail/em-folder-tree.c
---- evolution-2.12.0/mail/em-folder-tree.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/em-folder-tree.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/em-folder-tree.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-tree.c 2007-10-09 09:43:35.000000000 -0400
@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
guint32 flags;
@@ -52,7 +61,7 @@ diff -up evolution-2.12.0/mail/em-folder-tree.c.icon-names evolution-2.12.0/mail
};
static void
-@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = {
+@@ -2114,16 +2114,16 @@ static EPopupItem emft_popup_items[] = {
{ E_POPUP_BAR, "20.emc" },
/* FIXME: need to disable for nochildren folders */
@@ -69,9 +78,14 @@ diff -up evolution-2.12.0/mail/em-folder-tree.c.icon-names evolution-2.12.0/mail
{ E_POPUP_BAR, "80.emc" },
+- { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
++ { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
+ };
+ static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT};
+
diff -up evolution-2.12.0/mail/message-list.c.icon-names evolution-2.12.0/mail/message-list.c
---- evolution-2.12.0/mail/message-list.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/message-list.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/message-list.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/message-list.c 2007-10-09 09:41:05.000000000 -0400
@@ -217,9 +217,9 @@ static struct {
char *icon_name;
GdkPixbuf *pixbuf;
@@ -86,8 +100,8 @@ diff -up evolution-2.12.0/mail/message-list.c.icon-names evolution-2.12.0/mail/m
{ "stock_mail-open-multiple", NULL },
{ NULL, NULL },
diff -up evolution-2.12.0/mail/mail-mt.c.icon-names evolution-2.12.0/mail/mail-mt.c
---- evolution-2.12.0/mail/mail-mt.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/mail-mt.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/mail-mt.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/mail-mt.c 2007-10-09 09:41:05.000000000 -0400
@@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m
data->activity_state = 1;
@@ -98,8 +112,8 @@ diff -up evolution-2.12.0/mail/mail-mt.c.icon-names evolution-2.12.0/mail/mail-m
MAIL_MT_UNLOCK (mail_msg_lock);
if (msg->info->desc)
diff -up evolution-2.12.0/mail/em-folder-view.c.icon-names evolution-2.12.0/mail/em-folder-view.c
---- evolution-2.12.0/mail/em-folder-view.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/em-folder-view.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/em-folder-view.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-view.c 2007-10-09 09:41:05.000000000 -0400
@@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current
/* TODO: Move some of these to be 'standard' menu's */
@@ -226,7 +240,7 @@ diff -up evolution-2.12.0/mail/em-folder-view.c.icon-names evolution-2.12.0/mail
{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
diff -up evolution-2.12.0/mail/em-popup.c.icon-names evolution-2.12.0/mail/em-popup.c
--- evolution-2.12.0/mail/em-popup.c.icon-names 2007-09-16 15:17:46.000000000 -0400
-+++ evolution-2.12.0/mail/em-popup.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/mail/em-popup.c 2007-10-09 09:46:57.000000000 -0400
@@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop
}
@@ -268,13 +282,13 @@ diff -up evolution-2.12.0/mail/em-popup.c.icon-names evolution-2.12.0/mail/em-po
- { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO },
- { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO },
+ { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO },
-+ { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "edit-add", EM_POPUP_URI_MAILTO },
++ { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO },
};
/* ********************************************************************** */
diff -up evolution-2.12.0/mail/mail-send-recv.c.icon-names evolution-2.12.0/mail/mail-send-recv.c
---- evolution-2.12.0/mail/mail-send-recv.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/mail-send-recv.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/mail-send-recv.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/mail-send-recv.c 2007-10-09 09:41:05.000000000 -0400
@@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca
gtk_widget_show (cancel_button);
gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
@@ -294,8 +308,8 @@ diff -up evolution-2.12.0/mail/mail-send-recv.c.icon-names evolution-2.12.0/mail
label = gtk_label_new (NULL);
gtk_label_set_ellipsize (
diff -up evolution-2.12.0/mail/mail-component.c.icon-names evolution-2.12.0/mail/mail-component.c
---- evolution-2.12.0/mail/mail-component.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/mail/mail-component.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/mail/mail-component.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/mail/mail-component.c 2007-10-09 09:41:05.000000000 -0400
@@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableSe
list->_buffer[0].menuDescription = _("_Mail Message");
list->_buffer[0].tooltip = _("Compose a new mail message");
@@ -315,8 +329,8 @@ diff -up evolution-2.12.0/mail/mail-component.c.icon-names evolution-2.12.0/mail
return list;
diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder.c
---- evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/plugins/exchange-operations/exchange-folder.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder.c 2007-10-09 09:41:05.000000000 -0400
@@ -63,7 +63,7 @@ static void exchange_get_folder (char *u
@@ -346,7 +360,7 @@ diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-nam
void
diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c
--- evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names 2007-09-16 15:16:25.000000000 -0400
-+++ evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c 2007-10-09 09:41:05.000000000 -0400
@@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss
gchar *selected_exchange_folder_uri = NULL;
@@ -358,7 +372,7 @@ diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission
static void
diff -up evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
--- evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names 2007-09-16 15:16:26.000000000 -0400
-+++ evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml 2007-10-09 09:41:05.000000000 -0400
@@ -8,10 +8,10 @@
diff -up evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.12.0/plugins/groupwise-features/share-folder-common.c
---- evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/plugins/groupwise-features/share-folder-common.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/plugins/groupwise-features/share-folder-common.c 2007-10-09 09:41:05.000000000 -0400
@@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e
}
@@ -386,7 +400,7 @@ diff -up evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-
static void
diff -up evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-component.c
--- evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names 2007-09-16 14:52:56.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/component/addressbook-component.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-component.c 2007-10-09 09:41:05.000000000 -0400
@@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe
list->_buffer[0].menuDescription = _("_Contact");
list->_buffer[0].tooltip = _("Create a new contact");
@@ -398,7 +412,7 @@ diff -up evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon
list->_buffer[1].id = "contact_list";
diff -up evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-view.c
--- evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names 2007-09-16 14:52:56.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/component/addressbook-view.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-view.c 2007-10-09 09:42:08.000000000 -0400
@@ -71,7 +71,7 @@
static GObjectClass *parent_class = NULL;
@@ -442,7 +456,7 @@ diff -up evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-name
+ E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU),
-+ E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", 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/FolderSave", "document-save-as", E_ICON_SIZE_MENU),
@@ -478,7 +492,7 @@ diff -up evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-name
diff -up evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c
--- evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names 2007-09-16 14:53:27.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c 2007-10-09 09:41:05.000000000 -0400
@@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem,
static EPopupItem eabv_popup_items[] = {
{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
@@ -521,7 +535,7 @@ diff -up evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-name
static void
diff -up evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c
--- evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names 2007-09-16 14:53:27.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c 2007-10-09 09:41:05.000000000 -0400
@@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid
static EPopupItem eab_uri_popups[] = {
@@ -537,7 +551,7 @@ diff -up evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-nam
diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c
--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names 2007-09-16 14:52:39.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-10-09 09:41:05.000000000 -0400
@@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContact
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
g_object_unref(widget);
@@ -549,7 +563,7 @@ diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullna
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c
--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names 2007-09-16 14:52:39.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-10-09 09:41:05.000000000 -0400
@@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactE
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
g_object_unref(widget);
@@ -561,7 +575,7 @@ diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-addres
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c
--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names 2007-09-16 14:52:39.000000000 -0400
-+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-10-09 09:41:05.000000000 -0400
@@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor
gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
@@ -573,7 +587,7 @@ diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.i
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/ui/evolution.xml.icon-names evolution-2.12.0/ui/evolution.xml
--- evolution-2.12.0/ui/evolution.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution.xml 2007-10-09 09:41:05.000000000 -0400
@@ -7,10 +7,10 @@
@@ -613,7 +627,7 @@ diff -up evolution-2.12.0/ui/evolution.xml.icon-names evolution-2.12.0/ui/evolut
diff -up evolution-2.12.0/ui/evolution-event-editor.xml.icon-names evolution-2.12.0/ui/evolution-event-editor.xml
--- evolution-2.12.0/ui/evolution-event-editor.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-event-editor.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-event-editor.xml 2007-10-09 09:41:05.000000000 -0400
@@ -45,13 +45,15 @@
_tip="Make this a recurring event" pixtype="pixbuf"/>
@@ -654,7 +668,7 @@ diff -up evolution-2.12.0/ui/evolution-event-editor.xml.icon-names evolution-2.1
diff -up evolution-2.12.0/ui/evolution-memos.xml.icon-names evolution-2.12.0/ui/evolution-memos.xml
--- evolution-2.12.0/ui/evolution-memos.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-memos.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-memos.xml 2007-10-09 09:41:05.000000000 -0400
@@ -1,15 +1,15 @@
@@ -700,7 +714,7 @@ diff -up evolution-2.12.0/ui/evolution-memos.xml.icon-names evolution-2.12.0/ui/
diff -up evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names evolution-2.12.0/ui/evolution-composer-entries.xml
--- evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-composer-entries.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-composer-entries.xml 2007-10-09 09:41:05.000000000 -0400
@@ -3,15 +3,15 @@
diff -up evolution-2.12.0/ui/evolution-mail-list.xml.icon-names evolution-2.12.0/ui/evolution-mail-list.xml
--- evolution-2.12.0/ui/evolution-mail-list.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-mail-list.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-list.xml 2007-10-09 09:41:05.000000000 -0400
@@ -4,15 +4,15 @@
diff -up evolution-2.12.0/ui/evolution-subscribe.xml.icon-names evolution-2.12.0/ui/evolution-subscribe.xml
--- evolution-2.12.0/ui/evolution-subscribe.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-subscribe.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-subscribe.xml 2007-10-09 09:41:05.000000000 -0400
@@ -3,7 +3,7 @@
@@ -774,7 +788,7 @@ diff -up evolution-2.12.0/ui/evolution-subscribe.xml.icon-names evolution-2.12.0
diff -up evolution-2.12.0/ui/evolution-tasks.xml.icon-names evolution-2.12.0/ui/evolution-tasks.xml
--- evolution-2.12.0/ui/evolution-tasks.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-tasks.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-tasks.xml 2007-10-09 09:41:05.000000000 -0400
@@ -1,20 +1,20 @@
@@ -834,7 +848,7 @@ diff -up evolution-2.12.0/ui/evolution-tasks.xml.icon-names evolution-2.12.0/ui/
diff -up evolution-2.12.0/ui/evolution-addressbook.xml.icon-names evolution-2.12.0/ui/evolution-addressbook.xml
--- evolution-2.12.0/ui/evolution-addressbook.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-addressbook.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-addressbook.xml 2007-10-09 09:41:05.000000000 -0400
@@ -1,18 +1,17 @@
@@ -1001,7 +1015,7 @@ diff -up evolution-2.12.0/ui/evolution-addressbook.xml.icon-names evolution-2.12
_label="Stop"/>
diff -up evolution-2.12.0/ui/evolution-editor.xml.icon-names evolution-2.12.0/ui/evolution-editor.xml
--- evolution-2.12.0/ui/evolution-editor.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-editor.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-editor.xml 2007-10-09 09:41:05.000000000 -0400
@@ -1,15 +1,15 @@
@@ -1046,7 +1060,7 @@ diff -up evolution-2.12.0/ui/evolution-editor.xml.icon-names evolution-2.12.0/ui
diff -up evolution-2.12.0/ui/evolution-mail-message.xml.icon-names evolution-2.12.0/ui/evolution-mail-message.xml
--- evolution-2.12.0/ui/evolution-mail-message.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-mail-message.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-message.xml 2007-10-09 09:41:05.000000000 -0400
@@ -11,15 +11,15 @@
@@ -1187,7 +1201,7 @@ diff -up evolution-2.12.0/ui/evolution-task-editor.xml.icon-names evolution-2.12
diff -up evolution-2.12.0/ui/evolution-message-composer.xml.icon-names evolution-2.12.0/ui/evolution-message-composer.xml
--- evolution-2.12.0/ui/evolution-message-composer.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-message-composer.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-message-composer.xml 2007-10-09 09:41:05.000000000 -0400
@@ -2,22 +2,22 @@
@@ -1257,7 +1271,7 @@ diff -up evolution-2.12.0/ui/evolution-message-composer.xml.icon-names evolution
diff -up evolution-2.12.0/ui/evolution-calendar.xml.icon-names evolution-2.12.0/ui/evolution-calendar.xml
--- evolution-2.12.0/ui/evolution-calendar.xml.icon-names 2007-09-16 15:35:19.000000000 -0400
-+++ evolution-2.12.0/ui/evolution-calendar.xml 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/ui/evolution-calendar.xml 2007-10-09 09:41:05.000000000 -0400
@@ -1,14 +1,14 @@
@@ -1318,8 +1332,8 @@ diff -up evolution-2.12.0/ui/evolution-calendar.xml.icon-names evolution-2.12.0/
diff -up evolution-2.12.0/composer/e-msg-composer.c.icon-names evolution-2.12.0/composer/e-msg-composer.c
---- evolution-2.12.0/composer/e-msg-composer.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/composer/e-msg-composer.c 2007-10-03 21:29:11.000000000 -0400
+--- evolution-2.12.0/composer/e-msg-composer.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer.c 2007-10-09 09:41:05.000000000 -0400
@@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = {
};
@@ -1365,7 +1379,7 @@ diff -up evolution-2.12.0/composer/e-msg-composer.c.icon-names evolution-2.12.0/
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names evolution-2.12.0/composer/e-msg-composer-select-file.c
--- evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names 2007-09-16 15:18:00.000000000 -0400
-+++ evolution-2.12.0/composer/e-msg-composer-select-file.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer-select-file.c 2007-10-09 09:41:05.000000000 -0400
@@ -126,7 +126,7 @@ get_selector(struct _EMsgComposer *compo
gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer");
gtk_window_set_modal ((GtkWindow *) selection, FALSE);
@@ -1377,7 +1391,7 @@ diff -up evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names evolu
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/shell/e-shell-window-commands.c.icon-names evolution-2.12.0/shell/e-shell-window-commands.c
--- evolution-2.12.0/shell/e-shell-window-commands.c.icon-names 2007-09-16 14:56:25.000000000 -0400
-+++ evolution-2.12.0/shell/e-shell-window-commands.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/shell/e-shell-window-commands.c 2007-10-09 09:41:05.000000000 -0400
@@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = {
};
@@ -1399,7 +1413,7 @@ diff -up evolution-2.12.0/shell/e-shell-window-commands.c.icon-names evolution-2
};
diff -up evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names evolution-2.12.0/calendar/gui/e-memo-table.c
--- evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-memo-table.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-memo-table.c 2007-10-09 09:41:05.000000000 -0400
@@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] =
{ E_POPUP_BAR, "70.bar" },
@@ -1411,19 +1425,23 @@ diff -up evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names evolution-2.12.
diff -up evolution-2.12.0/calendar/gui/memos-component.c.icon-names evolution-2.12.0/calendar/gui/memos-component.c
--- evolution-2.12.0/calendar/gui/memos-component.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/memos-component.c 2007-10-03 21:27:50.000000000 -0400
-@@ -463,7 +463,7 @@ edit_memo_list_cb (EPopup *ep, EPopupIte
++++ evolution-2.12.0/calendar/gui/memos-component.c 2007-10-09 09:46:13.000000000 -0400
+@@ -462,9 +462,9 @@ edit_memo_list_cb (EPopup *ep, EPopupIte
+
static EPopupItem emc_source_popups[] = {
{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
};
+ static void
diff -up evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/event-editor.c
--- evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names 2007-09-16 15:33:57.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/dialogs/event-editor.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-editor.c 2007-10-09 09:41:05.000000000 -0400
@@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
* icons is filled in at run-time in event_editor_init() are
* updated, too.
@@ -1466,7 +1484,7 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names evoluti
diff -up evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/task-editor.c
--- evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names 2007-09-16 15:33:57.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/dialogs/task-editor.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-editor.c 2007-10-09 09:41:06.000000000 -0400
@@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = {
};
@@ -1482,7 +1500,7 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names evolutio
};
diff -up evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c
--- evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names 2007-09-16 15:33:57.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-10-09 09:41:06.000000000 -0400
@@ -123,7 +123,7 @@ run_selector(CompEditor *editor, const c
gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
gtk_window_set_modal ((GtkWindow *) selection, TRUE);
@@ -1493,8 +1511,8 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon
gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/comp-editor.c
---- evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/dialogs/comp-editor.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/comp-editor.c 2007-10-09 09:41:06.000000000 -0400
@@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = {
};
@@ -1525,16 +1543,20 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolutio
case E_CAL_COMPONENT_JOURNAL:
diff -up evolution-2.12.0/calendar/gui/calendar-component.c.icon-names evolution-2.12.0/calendar/gui/calendar-component.c
--- evolution-2.12.0/calendar/gui/calendar-component.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/calendar-component.c 2007-10-03 21:27:50.000000000 -0400
-@@ -604,7 +604,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
++++ evolution-2.12.0/calendar/gui/calendar-component.c 2007-10-09 09:45:24.000000000 -0400
+@@ -603,9 +603,9 @@ edit_calendar_cb (EPopup *ep, EPopupItem
+
static EPopupItem ecc_source_popups[] = {
{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
+- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
};
+ static void
@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe
list->_buffer[0].menuDescription = _("_Appointment");
list->_buffer[0].tooltip = _("Create a new appointment");
@@ -1546,7 +1568,7 @@ diff -up evolution-2.12.0/calendar/gui/calendar-component.c.icon-names evolution
list->_buffer[1].id = CREATE_MEETING_ID;
diff -up evolution-2.12.0/calendar/gui/tasks-control.c.icon-names evolution-2.12.0/calendar/gui/tasks-control.c
--- evolution-2.12.0/calendar/gui/tasks-control.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/tasks-control.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/tasks-control.c 2007-10-09 09:41:06.000000000 -0400
@@ -38,7 +38,7 @@
#include
#include
@@ -1579,7 +1601,7 @@ diff -up evolution-2.12.0/calendar/gui/tasks-control.c.icon-names evolution-2.12
};
diff -up evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-table.c
--- evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-calendar-table.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-table.c 2007-10-09 09:41:06.000000000 -0400
@@ -1365,7 +1365,7 @@ static EPopupItem tasks_popup_items [] =
{ E_POPUP_BAR, "70.bar" },
@@ -1590,8 +1612,8 @@ diff -up evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names evolution-2
{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
diff -up evolution-2.12.0/calendar/gui/e-day-view.c.icon-names evolution-2.12.0/calendar/gui/e-day-view.c
---- evolution-2.12.0/calendar/gui/e-day-view.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-day-view.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/calendar/gui/e-day-view.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-day-view.c 2007-10-09 09:41:06.000000000 -0400
@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
/* Create the pixmaps. */
@@ -1612,7 +1634,7 @@ diff -up evolution-2.12.0/calendar/gui/e-day-view.c.icon-names evolution-2.12.0/
day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
diff -up evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-view.c
--- evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-calendar-view.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-view.c 2007-10-09 09:41:06.000000000 -0400
@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
}
@@ -1637,19 +1659,23 @@ diff -up evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names evolution-2.
diff -up evolution-2.12.0/calendar/gui/tasks-component.c.icon-names evolution-2.12.0/calendar/gui/tasks-component.c
--- evolution-2.12.0/calendar/gui/tasks-component.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/tasks-component.c 2007-10-03 21:27:50.000000000 -0400
-@@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
++++ evolution-2.12.0/calendar/gui/tasks-component.c 2007-10-09 09:44:37.000000000 -0400
+@@ -453,9 +453,9 @@ edit_task_list_cb (EPopup *ep, EPopupIte
+
static EPopupItem etc_source_popups[] = {
{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
++ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
};
+ static void
diff -up evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names evolution-2.12.0/calendar/gui/calendar-commands.c
--- evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/calendar-commands.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/calendar-commands.c 2007-10-09 09:41:06.000000000 -0400
@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
@@ -1691,7 +1717,7 @@ diff -up evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names evolution-
};
diff -up evolution-2.12.0/calendar/gui/memos-control.c.icon-names evolution-2.12.0/calendar/gui/memos-control.c
--- evolution-2.12.0/calendar/gui/memos-control.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/memos-control.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/memos-control.c 2007-10-09 09:41:06.000000000 -0400
@@ -39,6 +39,7 @@
#include
#include
@@ -1735,7 +1761,7 @@ diff -up evolution-2.12.0/calendar/gui/memos-control.c.icon-names evolution-2.12
/* Signals from the memos widget; also sensitize the menu items as appropriate */
diff -up evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.0/calendar/gui/e-cal-popup.c
--- evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names 2007-09-16 15:34:45.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-cal-popup.c 2007-10-03 21:27:50.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-cal-popup.c 2007-10-09 09:41:06.000000000 -0400
@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
@@ -1749,8 +1775,8 @@ diff -up evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.0
};
diff -up evolution-2.12.0/calendar/gui/e-week-view.c.icon-names evolution-2.12.0/calendar/gui/e-week-view.c
---- evolution-2.12.0/calendar/gui/e-week-view.c.icon-names 2007-10-03 21:27:50.000000000 -0400
-+++ evolution-2.12.0/calendar/gui/e-week-view.c 2007-10-03 21:27:50.000000000 -0400
+--- evolution-2.12.0/calendar/gui/e-week-view.c.icon-names 2007-10-09 09:41:05.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-week-view.c 2007-10-09 09:41:06.000000000 -0400
@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
/* Create the pixmaps. */
diff --git a/evolution.spec b/evolution.spec
index fa014ab..b44583a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
Name: evolution
Version: 2.12.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -712,6 +712,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/omf/evolution
%changelog
+* Tue Oct 09 2007 Matthew Barnes - 2.12.0-7.fc8
+- Revise patch for GNOME bug #477045 (more icon tweaks).
+
* Fri Oct 05 2007 Matthew Barnes - 2.12.0-6.fc8
- Require libbonobo >= 2.16.0 (RH bug #213823).