Hello community,
here is the log from the commit of package evolution
checked in at Fri Apr 28 21:10:19 CEST 2006.
--------
--- GNOME/evolution/evolution.changes 2006-04-24 12:11:23.000000000 +0200
+++ STABLE/evolution/evolution.changes 2006-04-26 22:11:06.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 26 22:08:27 CEST 2006 - dobey@suse.de
+
+- Update trach icon patch to deal with more instances
+ Fixes https://bugzilla.novell.com/show_bug.cgi?id=160837
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.ieegik/_old 2006-04-28 21:10:08.000000000 +0200
+++ /var/tmp/diff_new_pack.ieegik/_new 2006-04-28 21:10:08.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Obsoletes: bonobo-conf
Version: 2.6.0
-Release: 33
+Release: 37
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2
Source1: summerdance-about2.png
@@ -482,6 +482,9 @@
%{prefix}/share/gnome-pilot/conduits/*.conduit
%changelog -n evolution
+* Wed Apr 26 2006 - dobey@suse.de
+- Update trach icon patch to deal with more instances
+ Fixes https://bugzilla.novell.com/show_bug.cgi?id=160837
* Mon Apr 24 2006 - sragavan@novell.com
- Fixes(bnc)
153180 - Fixes a broken dialog, when new appointment is created on a disabled
++++++ evolution-delete-icon.patch ++++++
--- /var/tmp/diff_new_pack.ieegik/_old 2006-04-28 21:10:10.000000000 +0200
+++ /var/tmp/diff_new_pack.ieegik/_new 2006-04-28 21:10:10.000000000 +0200
@@ -1,47 +1,93 @@
+Index: mail/em-folder-tree.c
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
+retrieving revision 1.158
+diff -u -p -r1.158 em-folder-tree.c
+--- mail/em-folder-tree.c 8 Feb 2006 11:51:31 -0000 1.158
++++ mail/em-folder-tree.c 19 Apr 2006 20:01:21 -0000
+@@ -287,7 +287,7 @@ render_pixbuf (GtkTreeViewColumn *column
+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
+- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU);
++ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
+Index: mail/em-folder-view.c
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
+retrieving revision 1.145
+diff -u -p -r1.145 em-folder-view.c
+--- mail/em-folder-view.c 8 Feb 2006 11:51:32 -0000 1.145
++++ mail/em-folder-view.c 19 Apr 2006 20:01:21 -0000
+@@ -1089,7 +1089,7 @@ static EPopupItem emfv_popup_items[] = {
+
+ { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
+ { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+- { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
++ { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+
+@@ -1747,8 +1747,7 @@ static EPixmap emfv_message_pixmaps[] =
+
+ E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageDelete", "stock_delete", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageUndelete", "stock_undelete", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU),
Index: ui/evolution-mail-global.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-global.xml,v
retrieving revision 1.40
diff -u -p -r1.40 evolution-mail-global.xml
--- ui/evolution-mail-global.xml 13 Jan 2006 16:24:02 -0000 1.40
-+++ ui/evolution-mail-global.xml 15 Mar 2006 09:14:20 -0000
++++ ui/evolution-mail-global.xml 19 Apr 2006 20:01:21 -0000
@@ -45,7 +45,7 @@
<submenu name="File">
<placeholder name="EmptyTrashPlaceholder">
- <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="stock" pixname="gtk-delete"/>
-+ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="pixbuf"/>
++ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
</placeholder>
</submenu>
-Index: mail/em-folder-browser.c
+Index: ui/evolution-mail-message.xml
===================================================================
-RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
-retrieving revision 1.76
-diff -u -p -r1.76 em-folder-browser.c
---- mail/em-folder-browser.c 16 Feb 2006 08:11:48 -0000 1.76
-+++ mail/em-folder-browser.c 15 Mar 2006 09:14:21 -0000
-@@ -869,6 +869,7 @@ static EPixmap emfb_pixmaps[] = {
- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
-+ E_PIXMAP ("/menu/File/EmptyTrashPlaceholder/EmptyTrash", "stock_trash_full", E_ICON_SIZE_MENU),
+RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
+retrieving revision 1.90
+diff -u -p -r1.90 evolution-mail-message.xml
+--- ui/evolution-mail-message.xml 5 Feb 2006 22:41:41 -0000 1.90
++++ ui/evolution-mail-message.xml 19 Apr 2006 20:01:21 -0000
+@@ -59,7 +59,7 @@
+