From 309c868ceeddf538ecdfc52c7dada01d780d4316266135f742cfa701256b3472 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 13 Nov 2007 19:49:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=22 --- bnc-308959-mail-attachment-icon.patch | 134 ++++++++++++++++++++++++++ evolution.changes | 8 ++ evolution.spec | 9 +- 3 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 bnc-308959-mail-attachment-icon.patch diff --git a/bnc-308959-mail-attachment-icon.patch b/bnc-308959-mail-attachment-icon.patch new file mode 100644 index 0000000..40c3b4c --- /dev/null +++ b/bnc-308959-mail-attachment-icon.patch @@ -0,0 +1,134 @@ +--- calendar/gui/dialogs/comp-editor.c 2007-10-03 15:40:10.213280750 +0200 ++++ calendar/gui/dialogs/comp-editor.c 2007-10-03 15:43:06.801273004 +0200 +@@ -1487,8 +1487,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 ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), + + E_PIXMAP_END +@@ -1548,7 +1548,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); +Index: mail/em-folder-browser.c +=================================================================== +--- mail/em-folder-browser.c (revision 34234) ++++ mail/em-folder-browser.c (working copy) +@@ -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 }, */ +Index: mail/message-list.c +=================================================================== +--- mail/message-list.c (revision 34234) ++++ mail/message-list.c (working copy) +@@ -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 }, +Index: composer/e-msg-composer.c +=================================================================== +--- composer/e-msg-composer.c (revision 34234) ++++ composer/e-msg-composer.c (working copy) +@@ -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); + +Index: widgets/misc/e-attachment-bar.c +=================================================================== +--- widgets/misc/e-attachment-bar.c (revision 34234) ++++ widgets/misc/e-attachment-bar.c (working copy) +@@ -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); + } +Index: calendar/gui/e-day-view.c +=================================================================== +--- calendar/gui/e-day-view.c (revision 34234) ++++ calendar/gui/e-day-view.c (working copy) +@@ -1419,7 +1419,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. */ +@@ -1493,7 +1493,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. */ +Index: calendar/gui/e-week-view.c +=================================================================== +--- calendar/gui/e-week-view.c (revision 34234) ++++ calendar/gui/e-week-view.c (working copy) +@@ -693,7 +693,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 --git a/evolution.changes b/evolution.changes index 1da12e2..86b292f 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 13 07:46:15 CET 2007 - psankar@suse.de + +- bnc-308959-mail-attachment-icon.patch: Fixes mail attachment icon +not shown in the message list issue. + +- Fixes bug #308959 (10.3) and #340920 (Factory) + ------------------------------------------------------------------- Mon Sep 17 20:29:43 CEST 2007 - vvaradhan@suse.de diff --git a/evolution.spec b/evolution.spec index 6918585..9d8f7da 100644 --- a/evolution.spec +++ b/evolution.spec @@ -18,7 +18,7 @@ Obsoletes: evoltn Provides: evoltn AutoReqProv: on Version: 2.12.0 -Release: 1 +Release: 29 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2 @@ -60,6 +60,7 @@ Patch100: abuild.patch Patch102: evolution-2.11.6.1-cal-busy-recursion.patch Patch103: bnc-302017-print-100pc.diff Patch104: bnc-294999-subs-other-user-folder.patch +Patch105: bnc-308959-mail-attachment-icon.patch Patch999: build-fixes.diff Patch1000: evolution-stringcompare.patch Url: http://gnome.org/projects/evolution/ @@ -317,6 +318,7 @@ Authors: %patch102 -p1 %patch103 %patch104 +%patch105 %patch999 %patch1000 @@ -422,8 +424,11 @@ fi %defattr(-,root,root) %{_datadir}/gnome-pilot/conduits/*.conduit %{_libdir}/evolution/*/conduits/*.so - %changelog +* Tue Nov 13 2007 - psankar@suse.de +- bnc-308959-mail-attachment-icon.patch: Fixes mail attachment icon + not shown in the message list issue. +- Fixes bug #308959 (10.3) and #340920 (Factory) * Mon Sep 17 2007 - vvaradhan@suse.de - Fixes (BNC) [#295107] - Rename folder hides hierarchy