From d32203d9e18f0f2547ddc9eaa679a964221df6c5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Sep 2007 01:14:37 +0000 Subject: [PATCH] - Add patch for GNOME bug #476040 (fix attachment icon). --- evolution-2.11.92-mail-attachment.patch | 129 ++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.92-mail-attachment.patch diff --git a/evolution-2.11.92-mail-attachment.patch b/evolution-2.11.92-mail-attachment.patch new file mode 100644 index 0000000..6197ee7 --- /dev/null +++ b/evolution-2.11.92-mail-attachment.patch @@ -0,0 +1,129 @@ +diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c +--- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-11 18:58:15.000000000 -0400 +@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items + {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, + {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, + {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, +- {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"}, ++ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, + {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, + {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, + /* { NULL, 0, NULL }, */ +diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c +--- evolution-2.11.92/mail/message-list.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/mail/message-list.c 2007-09-11 18:58:15.000000000 -0400 +@@ -223,7 +223,7 @@ static struct { + { "stock_mail-unread-multiple", NULL }, + { "stock_mail-open-multiple", NULL }, + { NULL, NULL }, +- { "stock_attach", NULL }, ++ { "mail-attachment", NULL }, + { "emblem-important", NULL }, + { "stock_score-lowest", NULL }, + { "stock_score-lower", NULL }, +diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c +--- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment 2007-09-02 14:57:07.000000000 -0400 ++++ evolution-2.11.92/widgets/misc/e-attachment-bar.c 2007-09-11 18:58:15.000000000 -0400 +@@ -281,8 +281,7 @@ update (EAttachmentBar *bar) + attachment = priv->attachments->pdata[i]; + + if (!attachment->is_available_local || !attachment->body) { +- /* stock_attach would be better, but its fugly scaled up */ +- if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) { ++ if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { + attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); + g_object_unref (pixbuf); + } +@@ -373,8 +372,7 @@ update (EAttachmentBar *bar) + pixbuf = e_icon_for_mime_type (mime_type, 48); + if (pixbuf == NULL) { + g_warning("cannot find icon for mime type %s (installation problem?)", mime_type); +- /* stock_attach would be better, but its fugly scaled up */ +- pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG); ++ pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG); + } + g_free (mime_type); + } +diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c +--- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/composer/e-msg-composer.c 2007-09-11 18:58:15.000000000 -0400 +@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = { + }; + + static EPixmap pixcache [] = { +- E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), ++ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , + +-/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */ ++/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ + E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), +@@ -3989,7 +3989,7 @@ create_composer (int visible_mask) + gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5); + expander_hbox = gtk_hbox_new (FALSE, 0); + +- p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU); ++ p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU); + gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5); + gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1); + +diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c +--- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-11 18:58:16.000000000 -0400 +@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget) + week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); + week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); +- week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); + } + +diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c +--- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment 2007-09-02 14:57:08.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c 2007-09-11 18:58:15.000000000 -0400 +@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = { + }; + + static EPixmap pixmaps[] = { +- E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), +- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU), ++ E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), ++ E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), + + E_PIXMAP_END + }; +@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor) + gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5); + expander_hbox = gtk_hbox_new (FALSE, 0); + +- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); + gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5); + gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1); +diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c +--- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-11 18:58:16.000000000 -0400 +@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget) + day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + 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 ("stock_attach", E_ICON_SIZE_MENU); ++ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + + + /* Set the canvas item colors. */ +@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget) + day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + 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 ("stock_attach", E_ICON_SIZE_MENU); ++ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + + + /* Set the canvas item colors. */ diff --git a/evolution.spec b/evolution.spec index 7fb349e..3406c69 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,6 +121,9 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch +# GNOME bug #476040 +Patch35: evolution-2.11.92-mail-attachment.patch + ## Dependencies ### Requires(post): GConf2 @@ -260,6 +263,7 @@ This package contains the help for Evolution. %patch31 -p1 -b .meeting-list-view %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .mail-attachment mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -709,6 +713,9 @@ rm -rf $RPM_BUILD_ROOT # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629). %changelog +* Tue Sep 11 2007 Matthew Barnes - 2.11.92-3.fc8 +- Add patch for GNOME bug #476040 (fix attachment icon). + * Sat Sep 8 2007 Matthias Clasen - 2.11.92-2.fc8 - Split off an evolution-help package