From bf6360319519d159c021d717d5c6838738c4d89e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Wed, 19 Sep 2007 12:06:27 +0000
Subject: [PATCH] - Revise patch for GNOME bug #477045 (less-zealous icon
 renaming).

---
 evolution-2.11.92-icon-names.patch | 1017 +++++-----------------------
 evolution.spec                     |    5 +-
 2 files changed, 163 insertions(+), 859 deletions(-)

diff --git a/evolution-2.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch
index 25e1b23..c4eba0e 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.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
---- evolution-2.11.92/mail/em-folder-browser.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-browser.c	2007-09-19 07:14:51.000000000 -0400
 @@ -206,7 +206,7 @@ enum {
  /* Options for View */
  static EMFBSearchBarItem emfb_view_items[] = {
@@ -25,9 +25,9 @@ diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92
  /* 	{ NULL, 0, NULL }, */
  /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
  	{{ NULL, -1, 0 }, NULL}
-diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
---- evolution-2.11.92/mail/em-folder-tree.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-tree.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-tree.c	2007-09-19 07:14:51.000000000 -0400
 @@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
  	guint32 flags;
  	
@@ -69,201 +69,9 @@ diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/ma
  
  	
  	{ E_POPUP_BAR, "80.emc" },
-diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
---- evolution-2.11.92/mail/mail.error.xml.icon-names	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.92/mail/mail.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -16,14 +16,14 @@
-     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
- {0}
- Send anyway?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message without a subject?</_primary>
-     <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -32,14 +32,14 @@ Send anyway?</_secondary>
-     <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
- 
- Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
-     <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -51,36 +51,36 @@ Many email systems add an Apparently-To 
-   <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Use default drafts folder?</_primary>
-     <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to open {0} messages at once?</_primary>
-     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
-     <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
-     <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+    <button stock="application-exit" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="async-error" type="error">
-@@ -99,8 +99,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-warning" type="warning">
-@@ -109,8 +109,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-error" type="info">
-@@ -119,15 +119,15 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
-     <_primary>Enter password.</_primary>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="filter-load-error" type="error">
-@@ -179,15 +179,15 @@ Many email systems add an Apparently-To 
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
-     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="no-rename-folder-exists" type="error">
-@@ -239,7 +239,7 @@ Many email systems add an Apparently-To 
-     <_title>Delete account?</_title>
-     <_primary>Are you sure you want to delete this account?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not d_elete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -248,7 +248,7 @@ Many email systems add an Apparently-To 
-     <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information and
- all proxy information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -275,8 +275,8 @@ all proxy information will be deleted pe
-     <_primary>Do you wish to save your changes?</_primary>
-     <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
-     <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="document-save" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="vfolder-notexist" type="error">
-@@ -329,9 +329,9 @@ Either by selecting the folders individu
-     <_secondary xml:space="preserve">A non-empty folder at &quot;{1}&quot; already exists.
- 
- You can choose to ignore this folder, overwrite or append its contents, or quit.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Ignore" response="GTK_RESPONSE_REJECT"/>
--    <button stock="gtk-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-+    <button stock="edit-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-     <button _label="_Append" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-@@ -344,7 +344,7 @@ You can choose to ignore this folder, ov
-     <_title>Querying server</_title>
-     <_primary>Please wait.</_primary>
-     <_secondary xml:space="preserve">Querying server for a list of supported authentication mechanisms.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   </error>
- 
-   <error id="gw-accountsetup-error" type="error">
-diff -up evolution-2.11.92/mail/message-list.c.icon-names evolution-2.11.92/mail/message-list.c
---- evolution-2.11.92/mail/message-list.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/message-list.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/message-list.c	2007-09-19 07:14:51.000000000 -0400
 @@ -217,9 +217,9 @@ static struct {
  	char *icon_name;
  	GdkPixbuf  *pixbuf;
@@ -277,9 +85,9 @@ diff -up evolution-2.11.92/mail/message-list.c.icon-names evolution-2.11.92/mail
  	{ "stock_mail-unread-multiple",        NULL },
  	{ "stock_mail-open-multiple",          NULL },
  	{ NULL,                                NULL },
-diff -up evolution-2.11.92/mail/mail-mt.c.icon-names evolution-2.11.92/mail/mail-mt.c
---- evolution-2.11.92/mail/mail-mt.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-mt.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-mt.c	2007-09-19 07:14:51.000000000 -0400
 @@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m
  			data->activity_state = 1;
  			
@@ -289,9 +97,9 @@ diff -up evolution-2.11.92/mail/mail-mt.c.icon-names evolution-2.11.92/mail/mail
  			
  			MAIL_MT_UNLOCK (mail_msg_lock);
  			if (msg->info->desc)
-diff -up evolution-2.11.92/mail/em-folder-view.c.icon-names evolution-2.11.92/mail/em-folder-view.c
---- evolution-2.11.92/mail/em-folder-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-view.c	2007-09-19 07:17:18.000000000 -0400
 @@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current
  /* TODO: Move some of these to be 'standard' menu's */
  
@@ -416,9 +224,9 @@ diff -up evolution-2.11.92/mail/em-folder-view.c.icon-names evolution-2.11.92/ma
  
  	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
  	{ 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.11.92/mail/em-popup.c.icon-names evolution-2.11.92/mail/em-popup.c
---- evolution-2.11.92/mail/em-popup.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-popup.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:17:27.000000000 -0400
 @@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop
  }
  
@@ -460,13 +268,13 @@ diff -up evolution-2.11.92/mail/em-popup.c.icon-names evolution-2.11.92/mail/em-
 -	{ 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, "list-add", 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 },
  };
  
  /* ********************************************************************** */
-diff -up evolution-2.11.92/mail/mail-send-recv.c.icon-names evolution-2.11.92/mail/mail-send-recv.c
---- evolution-2.11.92/mail/mail-send-recv.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-send-recv.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-send-recv.c	2007-09-19 07:14:51.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);
@@ -485,61 +293,10 @@ diff -up evolution-2.11.92/mail/mail-send-recv.c.icon-names evolution-2.11.92/ma
  		pretty_url = format_url (destination, NULL);
  		label = gtk_label_new (NULL);
  		gtk_label_set_ellipsize (
-diff -up evolution-2.11.92/mail/em-format-html-display.c.icon-names evolution-2.11.92/mail/em-format-html-display.c
---- evolution-2.11.92/mail/em-format-html-display.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-format-html-display.c	2007-09-15 16:53:46.000000000 -0400
-@@ -2322,7 +2322,7 @@ efhd_add_bar(EMFormatHTML *efh, GtkHTMLE
- 	priv->label = gtk_label_new(_("No Attachment"));
- 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->label), priv->arrow);
- 	save = gtk_button_new();
--	image = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
-+	image = gtk_image_new_from_stock ("document-save", GTK_ICON_SIZE_BUTTON);
- 	txt = gtk_label_new_with_mnemonic(_("S_ave"));
- 	priv->save_txt = txt;
- 	hbox1 = gtk_hbox_new(FALSE, 0);
-diff -up evolution-2.11.92/mail/em-mailer-prefs.c.icon-names evolution-2.11.92/mail/em-mailer-prefs.c
---- evolution-2.11.92/mail/em-mailer-prefs.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-mailer-prefs.c	2007-09-15 16:53:46.000000000 -0400
-@@ -783,7 +783,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 			void *status = e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if ((gboolean)status == TRUE) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -791,7 +791,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -836,7 +836,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 			status = (gboolean)e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if (status) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */				
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-@@ -845,7 +845,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/mail/mail-component.c
---- evolution-2.11.92/mail/mail-component.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -881,7 +881,7 @@ impl__get_userCreatableItems (PortableSe
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-component.c	2007-09-19 07:14:51.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");
  	list->_buffer[0].menuShortcut = 'm';
@@ -548,7 +305,7 @@ diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/ma
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "folder";
-@@ -889,7 +889,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[1].menuDescription = _("Mail _Folder");
  	list->_buffer[1].tooltip = _("Create a new mail folder");
  	list->_buffer[1].menuShortcut = '\0';
@@ -557,9 +314,9 @@ diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/ma
  	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
  
  	return list;
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder.c	2007-09-19 07:14:51.000000000 -0400
 @@ -63,7 +63,7 @@ static void exchange_get_folder (char *u
  
  
@@ -587,9 +344,9 @@ diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-na
  };
  
  void
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names	2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss
  gchar *selected_exchange_folder_uri = NULL;
  
@@ -599,9 +356,9 @@ diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder-permissio
  };
  
  static void
-diff -up evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
---- evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names	2007-07-05 02:09:22.000000000 -0400
-+++ evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -8,10 +8,10 @@
  	
  		<hook class="org.gnome.evolution.calendar.popup:1.0">
@@ -615,33 +372,9 @@ diff -up evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.x
  			</menu>
  		</hook>
  	</e-plugin>
-diff -up evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
---- evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names	2007-07-05 02:09:19.000000000 -0400
-+++ evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -14,7 +14,7 @@
- 	<item
- 	  type="item"
- 	  path="80.test"
--	  icon="gtk-copy"
-+	  icon="edit-copy"
- 	  _label="Copy _Email Address"
- 	  visible="mailto"
- 	  activate="org_gnome_copy_tool_copy_address"/>
-diff -up evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
---- evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names	2007-07-05 02:09:24.000000000 -0400
-+++ evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -18,7 +18,7 @@
- You should receive an answer from the mailing list shortly after the message has been sent.</_secondary>
-   <button _label="_Send message" response="GTK_RESPONSE_YES"/>
-   <button _label="_Edit message" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="malformed-header" type="error">
-diff -up evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.11.92/plugins/groupwise-features/share-folder-common.c
---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/groupwise-features/share-folder-common.c	2007-09-19 07:14:51.000000000 -0400
 @@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e
  }
  
@@ -651,93 +384,9 @@ diff -up evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon
  };
  
  static void 
-diff -up evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
---- evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names	2007-07-05 02:09:21.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -17,7 +17,7 @@ You cannot share folder with specified u
- <error id="recurrence" type="question" default="GTK_RESPONSE_YES">
- <primary>This is a recurring meeting</primary>
- <secondary>What would you like to {0}?</secondary>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="This instance" response="GTK_RESPONSE_NO"/>
-  <button label="All instances" response="GTK_RESPONSE_YES"/>
- </error>
-diff -up evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
---- evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names	2007-08-24 02:49:39.000000000 -0400
-+++ evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
- 		<_title>Attachment Reminder</_title>
- 		<_primary>Message has no attachments</_primary>
- 		<_secondary>Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one.</_secondary>
--		<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
-+		<button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
- 		<button response="GTK_RESPONSE_YES" _label="_Send"></button>
- 	</error>
- </error-list> 
-diff -up evolution-2.11.92/e-util/e-error.c.icon-names evolution-2.11.92/e-util/e-error.c
---- evolution-2.11.92/e-util/e-error.c.icon-names	2007-09-02 14:56:59.000000000 -0400
-+++ evolution-2.11.92/e-util/e-error.c	2007-09-15 16:53:46.000000000 -0400
-@@ -79,7 +79,7 @@ static GSList *ee_parent_list;
- /* ********************************************************************** */
- 
- static struct _e_error_button default_ok_button = {
--	NULL, "gtk-ok", NULL, GTK_RESPONSE_OK
-+	NULL, "dialog-ok", NULL, GTK_RESPONSE_OK
- };
- 
- static struct _e_error default_errors[] = {
-diff -up evolution-2.11.92/e-util/e-system.error.xml.icon-names evolution-2.11.92/e-util/e-system.error.xml
---- evolution-2.11.92/e-util/e-system.error.xml.icon-names	2007-07-05 02:10:56.000000000 -0400
-+++ evolution-2.11.92/e-util/e-system.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
-   <_title>Overwrite file?</_title>
-   <_primary>File exists &quot;{0}&quot;.</_primary>
-   <_secondary>Do you wish to overwrite it?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Overwrite" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-diff -up evolution-2.11.92/addressbook/addressbook.error.xml.icon-names evolution-2.11.92/addressbook/addressbook.error.xml
---- evolution-2.11.92/addressbook/addressbook.error.xml.icon-names	2007-07-05 02:06:57.000000000 -0400
-+++ evolution-2.11.92/addressbook/addressbook.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -35,8 +35,8 @@
-  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete address book '{0}'?</_primary>
-   <_secondary>This address book will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="edit-categories" type="error">
-@@ -67,8 +67,8 @@
-   <_primary>Would you like to save your changes?</_primary>
-   <_secondary>You have made modifications to this contact. Do you want to save these changes?</_secondary>
-   <button _label="_Discard" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="document-save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
-@@ -98,8 +98,8 @@
-  <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Address '{0}' already exists.</_primary>
-   <_secondary>A contact already exists with this address. Would you like to add a new card with the same address anyway?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-component.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-component.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Contact");
  	list->_buffer[0].tooltip = _("Create a new contact");
@@ -747,9 +396,9 @@ diff -up evolution-2.11.92/addressbook/gui/component/addressbook-component.c.ico
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "contact_list";
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-view.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -71,7 +71,7 @@
  static GObjectClass *parent_class = NULL;
  
@@ -827,9 +476,9 @@ diff -up evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-nam
  	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
  	gtk_widget_show (priv->info_widget);
  
-diff -up evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c
---- evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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 },
@@ -870,9 +519,9 @@ diff -up evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-nam
  };
  
  static void
-diff -up evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c
---- evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:17:05.000000000 -0400
 @@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid
  
  static EPopupItem eab_uri_popups[] = {
@@ -886,9 +535,9 @@ diff -up evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-na
          };
  
  
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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);
@@ -898,9 +547,9 @@ diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fulln
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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);
@@ -910,9 +559,9 @@ diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-addre
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor
  	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
  
@@ -922,9 +571,9 @@ diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/ui/evolution.xml.icon-names evolution-2.11.92/ui/evolution.xml
---- evolution-2.11.92/ui/evolution.xml.icon-names	2007-07-08 22:46:51.000000000 -0400
-+++ evolution-2.11.92/ui/evolution.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -7,10 +7,10 @@
      <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/>
  
@@ -962,9 +611,9 @@ diff -up evolution-2.11.92/ui/evolution.xml.icon-names evolution-2.11.92/ui/evol
      </submenu>
  
      <submenu name="Edit" _label="_Edit">
-diff -up evolution-2.11.92/ui/evolution-event-editor.xml.icon-names evolution-2.11.92/ui/evolution-event-editor.xml
---- evolution-2.11.92/ui/evolution-event-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-event-editor.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -45,13 +45,15 @@
  		_tip="Make this a recurring event" pixtype="pixbuf"/>
  
@@ -1003,9 +652,9 @@ diff -up evolution-2.11.92/ui/evolution-event-editor.xml.icon-names evolution-2.
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-memos.xml.icon-names evolution-2.11.92/ui/evolution-memos.xml
---- evolution-2.11.92/ui/evolution-memos.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-memos.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1049,9 +698,9 @@ diff -up evolution-2.11.92/ui/evolution-memos.xml.icon-names evolution-2.11.92/u
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names evolution-2.11.92/ui/evolution-composer-entries.xml
---- evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-composer-entries.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -3,15 +3,15 @@
  
      <cmd name="EditCut"
@@ -1078,9 +727,9 @@ diff -up evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names evolutio
 -</Root>
 \ No newline at end of file
 +</Root>
-diff -up evolution-2.11.92/ui/evolution-mail-list.xml.icon-names evolution-2.11.92/ui/evolution-mail-list.xml
---- evolution-2.11.92/ui/evolution-mail-list.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-list.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -4,15 +4,15 @@
  
      <cmd name="EditCut"
@@ -1111,9 +760,9 @@ diff -up evolution-2.11.92/ui/evolution-mail-list.xml.icon-names evolution-2.11.
  
   	  <separator f="" name="FolderOps1"/>
            <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
-diff -up evolution-2.11.92/ui/evolution-subscribe.xml.icon-names evolution-2.11.92/ui/evolution-subscribe.xml
---- evolution-2.11.92/ui/evolution-subscribe.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-subscribe.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -3,7 +3,7 @@
      <submenu name="File" _label="_File">
  
@@ -1123,9 +772,9 @@ diff -up evolution-2.11.92/ui/evolution-subscribe.xml.icon-names evolution-2.11.
  
      </submenu>
  
-diff -up evolution-2.11.92/ui/evolution-tasks.xml.icon-names evolution-2.11.92/ui/evolution-tasks.xml
---- evolution-2.11.92/ui/evolution-tasks.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-tasks.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1,20 +1,20 @@
  <Root>
    <commands>
@@ -1183,9 +832,9 @@ diff -up evolution-2.11.92/ui/evolution-tasks.xml.icon-names evolution-2.11.92/u
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-addressbook.xml.icon-names evolution-2.11.92/ui/evolution-addressbook.xml
---- evolution-2.11.92/ui/evolution-addressbook.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-addressbook.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1,18 +1,17 @@
  <Root>
    <commands>
@@ -1350,9 +999,9 @@ diff -up evolution-2.11.92/ui/evolution-addressbook.xml.icon-names evolution-2.1
  
      <toolitem name="ContactStop" verb=""
  	      _label="Stop"/>
-diff -up evolution-2.11.92/ui/evolution-editor.xml.icon-names evolution-2.11.92/ui/evolution-editor.xml
---- evolution-2.11.92/ui/evolution-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-editor.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1395,9 +1044,9 @@ diff -up evolution-2.11.92/ui/evolution-editor.xml.icon-names evolution-2.11.92/
      <separator f="" name="editor1"/>
  
      <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/>
-diff -up evolution-2.11.92/ui/evolution-mail-message.xml.icon-names evolution-2.11.92/ui/evolution-mail-message.xml
---- evolution-2.11.92/ui/evolution-mail-message.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-message.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -11,15 +11,15 @@
  
      <cmd name="EditCut"
@@ -1524,9 +1173,9 @@ diff -up evolution-2.11.92/ui/evolution-mail-message.xml.icon-names evolution-2.
  
        <toolitem name="MessageDelete" verb=""
         _label="Delete"
-diff -up evolution-2.11.92/ui/evolution-task-editor.xml.icon-names evolution-2.11.92/ui/evolution-task-editor.xml
---- evolution-2.11.92/ui/evolution-task-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-task-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-task-editor.xml.icon-names evolution-2.12.0/ui/evolution-task-editor.xml
+--- evolution-2.12.0/ui/evolution-task-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-task-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -61,7 +61,7 @@
  		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
  		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
@@ -1536,9 +1185,9 @@ diff -up evolution-2.11.92/ui/evolution-task-editor.xml.icon-names evolution-2.1
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-message-composer.xml.icon-names evolution-2.11.92/ui/evolution-message-composer.xml
---- evolution-2.11.92/ui/evolution-message-composer.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-message-composer.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -2,22 +2,22 @@
  	<commands>
  
@@ -1606,9 +1255,9 @@ diff -up evolution-2.11.92/ui/evolution-message-composer.xml.icon-names evolutio
  			<separator/>
  			<menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
  			<separator/>
-diff -up evolution-2.11.92/ui/evolution-calendar.xml.icon-names evolution-2.11.92/ui/evolution-calendar.xml
---- evolution-2.11.92/ui/evolution-calendar.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-calendar.xml	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1,14 +1,14 @@
  <Root>
    <commands>
@@ -1668,9 +1317,9 @@ diff -up evolution-2.11.92/ui/evolution-calendar.xml.icon-names evolution-2.11.9
  
      <separator f="" name="ecal4"/>
  
-diff -up evolution-2.11.92/composer/e-msg-composer.c.icon-names evolution-2.11.92/composer/e-msg-composer.c
---- evolution-2.11.92/composer/e-msg-composer.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer.c	2007-09-19 07:14:51.000000000 -0400
 @@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -1732,30 +1381,9 @@ diff -up evolution-2.11.92/composer/e-msg-composer.c.icon-names evolution-2.11.9
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/composer/mail-composer.error.xml.icon-names evolution-2.11.92/composer/mail-composer.error.xml
---- evolution-2.11.92/composer/mail-composer.error.xml.icon-names	2007-07-05 02:09:41.000000000 -0400
-+++ evolution-2.11.92/composer/mail-composer.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -37,7 +37,7 @@
-   <error id="ask-send-message-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to send the mail?</_primary>
-   <_secondary xml:space="preserve"> There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -46,7 +46,7 @@
-   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
-   <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-diff -up evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names evolution-2.11.92/composer/e-msg-composer-select-file.c
---- evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer-select-file.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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);
@@ -1765,9 +1393,9 @@ diff -up evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names evol
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/shell/e-shell-window-commands.c.icon-names evolution-2.11.92/shell/e-shell-window-commands.c
---- evolution-2.11.92/shell/e-shell-window-commands.c.icon-names	2007-09-03 04:52:04.000000000 -0400
-+++ evolution-2.11.92/shell/e-shell-window-commands.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = {
  };
  
@@ -1787,309 +1415,9 @@ diff -up evolution-2.11.92/shell/e-shell-window-commands.c.icon-names evolution-
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/shell/shell.error.xml.icon-names evolution-2.11.92/shell/shell.error.xml
---- evolution-2.11.92/shell/shell.error.xml.icon-names	2007-07-05 02:07:01.000000000 -0400
-+++ evolution-2.11.92/shell/shell.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -4,7 +4,7 @@
-  <error id="importing" type="info">
-     <_title>Importing...</_title>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-nospace" type="error">
-@@ -12,7 +12,7 @@
-   <_secondary xml:space="preserve">Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.
- 
- You will need to make more space available in your home directory before you can continue.</_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-failed" type="error">
-@@ -22,8 +22,8 @@ You will need to make more space availab
- 
- If you choose to continue, you may not have access to some of your old data.
- </_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
-@@ -35,7 +35,7 @@ If you choose to remove this data, the e
- </_secondary>
-   <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-@@ -47,8 +47,8 @@ It is suggested you manually verify that
- 
- Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
- </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="noshell" type="error">
-@@ -58,7 +58,7 @@ Once deleted, you cannot downgrade to th
- 
- Click help for details</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="noshell-reason" type="error">
-@@ -70,13 +70,13 @@ Click help for details</_secondary>
- 
- Click help for details.</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="forget-passwords" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to forget all remembered passwords?</_primary>
-   <_secondary xml:space="preserve">Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Forget" response="GTK_RESPONSE_OK"/>
-  </error>
-  
-diff -up evolution-2.11.92/calendar/calendar.error.xml.icon-names evolution-2.11.92/calendar/calendar.error.xml
---- evolution-2.11.92/calendar/calendar.error.xml.icon-names	2007-08-24 02:50:09.000000000 -0400
-+++ evolution-2.11.92/calendar/calendar.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -11,8 +11,8 @@
-  <error id="prompt-delete-meeting" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this meeting?</_primary>
-   <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-task" type="question" default="GTK_RESPONSE_YES">
-@@ -25,8 +25,8 @@
-  <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-memo" type="question" default="GTK_RESPONSE_YES">
-@@ -39,57 +39,57 @@
-  <error id="prompt-delete-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this memo?</_primary>
-   <_secondary>All information on this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the appointment titled '{0}'?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to delete this appointment?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the '{0}' task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the memo '{0}'?</_primary>
-   <_secondary>All information in this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} appointments?</_primary>
-   <_secondary>All information on these appointments will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} tasks?</_primary>
-   <_secondary>All information on these tasks will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memos" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} memos?</_primary>
-   <_secondary>All information in these memos will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
-@@ -97,7 +97,7 @@
-   <_primary>Would you like to save your changes to this appointment?</_primary>
-   <_secondary>You have changed this appointment, but not yet saved it.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -106,7 +106,7 @@
-  <_primary>Would you like to save your changes to this task?</_primary>
-  <_secondary>You have changed this task, but not yet saved it.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -115,7 +115,7 @@
-  <_primary>Would you like to save your changes to this memo?</_primary>
-  <_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 	      
-@@ -143,14 +143,14 @@
-  <error id="ask-send-task-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the task?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the task would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-   <error id="ask-send-event-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the appointment?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -184,66 +184,66 @@
-  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete calendar '{0}'?</_primary>
-   <_secondary>This calendar will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete task list '{0}'?</_primary>
-   <_secondary>This task list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memo-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete memo list '{0}'?</_primary>
-   <_secondary>This memo list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the appointment without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the task without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your task will give your recipients an idea of what your task is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-memo" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to save the memo without a summary?</_primary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading calendar</_primary>
-   <_secondary>The calendar is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Cannot create a new event</_primary>
-   <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading task list</_primary>
-   <_secondary>The task list is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-memos" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading memo list</_primary>
-   <_secondary>The memo list is not marked for offline usage</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names evolution-2.11.92/calendar/gui/e-memo-table.c
---- evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-memo-table.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] =
  
  	{ E_POPUP_BAR, "70.bar" },
@@ -2099,9 +1427,9 @@ diff -up evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names evolution-2.11
  
  	{ E_POPUP_BAR, "90.bar" },
  
-diff -up evolution-2.11.92/calendar/gui/memos-component.c.icon-names evolution-2.11.92/calendar/gui/memos-component.c
---- evolution-2.11.92/calendar/gui/memos-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-component.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -463,7 +463,7 @@ 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 },
@@ -2111,18 +1439,9 @@ diff -up evolution-2.11.92/calendar/gui/memos-component.c.icon-names evolution-2
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/event-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/event-editor.c	2007-09-15 16:53:46.000000000 -0400
-@@ -368,7 +368,7 @@ create_schedule_page (EventEditor *ee)
- 
- 	priv->sched_window = gtk_dialog_new_with_buttons (_("Free/Busy"),
- 			(GtkWindow *) ee, GTK_DIALOG_MODAL,
--			"gtk-close", GTK_RESPONSE_CLOSE,
-+			"dialog-close", GTK_RESPONSE_CLOSE,
- 			NULL);
- 	priv->sched_page = schedule_page_new (priv->model);
- 	g_object_ref_sink (priv->sched_page);
+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-09-19 07:14:51.000000000 -0400
 @@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
  	 * icons is filled in at run-time in event_editor_init() are
  	 * updated, too.
@@ -2163,18 +1482,9 @@ diff -up evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names evolut
  	}
  	e_pixmaps_update (editor->uic, pixmaps);
  
-@@ -604,7 +605,7 @@ event_editor_construct (EventEditor *ee,
- 
- 	priv->recur_window = gtk_dialog_new_with_buttons (_("Recurrence"),
- 							  (GtkWindow *) ee, GTK_DIALOG_MODAL,
--							  "gtk-close", GTK_RESPONSE_CLOSE,
-+							  "dialog-close", GTK_RESPONSE_CLOSE,
- 							  NULL);
- 	g_signal_connect (priv->recur_window, "response", G_CALLBACK (gtk_widget_hide), NULL);
- 	g_signal_connect ((GtkWidget *) priv->recur_window, "delete-event", G_CALLBACK(window_delete_event), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/task-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/task-editor.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2188,18 +1498,9 @@ diff -up evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names evoluti
  	
  	E_PIXMAP_END
  };
-@@ -427,7 +429,7 @@ task_editor_construct (TaskEditor *te, E
- 
- 	priv->task_details_window = gtk_dialog_new_with_buttons (_("Task Details"),
- 								(GtkWindow *) te, GTK_DIALOG_MODAL,
--							  	"gtk-close", GTK_RESPONSE_CLOSE,
-+							  	"dialog-close", GTK_RESPONSE_CLOSE,
- 							  	NULL);
- 	g_signal_connect (priv->task_details_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
- 	g_signal_connect (priv->task_details_window, "delete-event", G_CALLBACK(gtk_widget_hide), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c
---- evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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);
@@ -2209,9 +1510,9 @@ diff -up evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.ico
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/comp-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2240,10 +1541,10 @@ diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names evoluti
  	case E_CAL_COMPONENT_TODO:
  		return "stock_task";
  	case E_CAL_COMPONENT_JOURNAL:
-diff -up evolution-2.11.92/calendar/gui/calendar-component.c.icon-names evolution-2.11.92/calendar/gui/calendar-component.c
---- evolution-2.11.92/calendar/gui/calendar-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -601,7 +601,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
+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-09-19 07:14:51.000000000 -0400
+@@ -604,7 +604,7 @@ 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 },
@@ -2252,7 +1553,7 @@ diff -up evolution-2.11.92/calendar/gui/calendar-component.c.icon-names evolutio
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-@@ -1579,7 +1579,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Appointment");
  	list->_buffer[0].tooltip = _("Create a new appointment");
  	list->_buffer[0].menuShortcut = 'a';
@@ -2261,9 +1562,9 @@ diff -up evolution-2.11.92/calendar/gui/calendar-component.c.icon-names evolutio
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = CREATE_MEETING_ID;
-diff -up evolution-2.11.92/calendar/gui/tasks-control.c.icon-names evolution-2.11.92/calendar/gui/tasks-control.c
---- evolution-2.11.92/calendar/gui/tasks-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-control.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2294,10 +1595,10 @@ diff -up evolution-2.11.92/calendar/gui/tasks-control.c.icon-names evolution-2.1
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
---- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-table.c	2007-09-15 16:53:46.000000000 -0400
-@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
+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-09-19 07:14:51.000000000 -0400
+@@ -1365,7 +1365,7 @@ static EPopupItem tasks_popup_items [] =
  	{ E_POPUP_BAR, "70.bar" },
  
  	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
@@ -2306,9 +1607,9 @@ diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-
  	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
  	{ 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.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
---- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-day-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */
@@ -2327,9 +1628,9 @@ diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.9
  	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
  	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
  	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
-diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
---- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
  }
  
@@ -2352,9 +1653,9 @@ diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2
  
  	{ E_POPUP_BAR, "50." },
  
-diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
---- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-component.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -454,7 +454,7 @@ 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 },
@@ -2364,9 +1665,9 @@ diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
---- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-commands.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
  	BONOBO_UI_VERB_END
  };
@@ -2406,9 +1707,9 @@ diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution
  
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
---- evolution-2.11.92/calendar/gui/memos-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-control.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
 @@ -39,6 +39,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2450,9 +1751,9 @@ diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.1
  	e_memos_setup_view_menus (memos, uic);
  
  	/* Signals from the memos widget; also sensitize the menu items as appropriate */
-diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
---- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-cal-popup.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.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" };
  
@@ -2465,9 +1766,9 @@ diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.
  	{ E_POPUP_BAR, "05.attach", },
  };
  
-diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
---- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-15 16:53:46.000000000 -0400
+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-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-week-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */
diff --git a/evolution.spec b/evolution.spec
index 4ee0b62..2471948 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -712,6 +712,9 @@ rm -rf $RPM_BUILD_ROOT
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-2.fc8
+- Revise patch for GNOME bug #477045 (less-zealous icon renaming).
+
 * Mon Sep 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0
 - Remove patch for RH bug #182247 (fixed upstream).