rpms/mail-notification/F-13 mail-notification-5.4-icons.patch, NONE, 1.1 mail-notification-5.4-weak.patch, NONE, 1.1 mail-notification.spec, 1.82, 1.83

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/mail-notification/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4807

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-5.4-icons.patch 
	mail-notification-5.4-weak.patch 
Log Message:


mail-notification-5.4-icons.patch:
 mn-stock.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE mail-notification-5.4-icons.patch ---
diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c
--- mail-notification-5.4/src/mn-stock.c	2008-05-22 19:45:35.000000000 +0400
+++ mail-notification-5.4-OK/src/mn-stock.c	2010-05-24 19:36:03.000000000 +0400
@@ -32,11 +32,11 @@
     const char	*icon_name;
     const char	*source_stock_id;
   } icons[] = {
-    { MN_STOCK_MAIL,			NULL, "stock_mail" },
-    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
-    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
-    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
-    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
+    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
+    { MN_STOCK_LOCAL,			NULL, "folder" },
+    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
+    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
 #if WITH_GMAIL
     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
@@ -48,14 +48,14 @@
     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
 #endif
 #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
-    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
+    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
 #endif
 #if WITH_EVOLUTION
     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
 #endif
-    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
-    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
-    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
+    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
+    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
   };
   GtkIconFactory *factory;
   GtkIconTheme *icon_theme;

mail-notification-5.4-weak.patch:
 mn-shell.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE mail-notification-5.4-weak.patch ---
diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
--- mail-notification-5.4/build/src/mn-shell.c	2008-05-22 19:47:49.000000000 +0400
+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-05-24 19:39:48.000000000 +0400
@@ -1008,6 +1008,7 @@
     Self *self = user_data;
 
     /* The Notification Area applet has been terminated. Recreate the icon. */
+    mn_remove_weak_pointer(&self->icon);
     self_init_icon(self);
   }}
 #line 1014 "mn-shell.c"


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/F-13/mail-notification.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- mail-notification.spec	16 Feb 2010 15:20:17 -0000	1.82
+++ mail-notification.spec	24 May 2010 15:46:50 -0000	1.83
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        18%{?dist}
+Release:        20%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,9 @@ Patch0:		mail-notification-5.4-evolution
 Patch1:		mail-notification-5.4-gmime.patch
 Patch2:		mail-notification-5.4-sasl_encode64.patch
 Patch3:		mail-notification-5.4-evolution-gtkhtml.patch
+Patch4:		mail-notification-5.4-camel_headers.patch
+Patch5:		mail-notification-5.4-icons.patch
+Patch6:		mail-notification-5.4-weak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -61,6 +64,9 @@ Evolution support for Mail Notification.
 %patch1 -p1 -b .gmime
 %patch2 -p1 -b .sasl_encode64
 %patch3 -p1 -b .gtkhtml
+%patch4 -p1 -b .camel_headers
+%patch5 -p1 -b .icons
+%patch6 -p1 -b .weak
 
 #  Drop #line statements in C sources generated bu .gob,
 #  for the proper debuginfo package
@@ -105,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-chmod +x $RPM_BUILD_ROOT%{_libdir}/evolution/2.*/plugins/*.so
+chmod +x $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/*.so
 
 desktop-file-install --vendor fedora                   \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/gnome/autostart/  \
@@ -182,10 +188,17 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 %files evolution-plugin
 %defattr(-,root,root,-)
-%{_libdir}/evolution/2.*/plugins/*
+%{_libdir}/evolution/*/plugins/*
 
 
 %changelog
+* Mon May 24 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-20
+- change icon usage for Fedora 13 (#573809)
+- fix some memory failures (Mat Booth <fedora at matbooth.co.uk>)
+
+* Tue May  4 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-19
+- rebuilt with new evolution-data-server
+
 * Fri Feb 16 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-18
 - rebuilt with gmime-2.6
 - explicitly link with libX11 (#564739)