From 98d8f14e3017cd8cf708db597fc96d1ff6c7d82e Mon Sep 17 00:00:00 2001
From: Dmitry Butskoy <buc@fedoraproject.org>
Date: May 24 2010 16:09:43 +0000
Subject: *** empty log message ***


---

diff --git a/mail-notification-5.4-icons.patch b/mail-notification-5.4-icons.patch
new file mode 100644
index 0000000..48d5474
--- /dev/null
+++ b/mail-notification-5.4-icons.patch
@@ -0,0 +1,39 @@
+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;
diff --git a/mail-notification-5.4-weak.patch b/mail-notification-5.4-weak.patch
new file mode 100644
index 0000000..2e2a233
--- /dev/null
+++ b/mail-notification-5.4-weak.patch
@@ -0,0 +1,11 @@
+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"
diff --git a/mail-notification.spec b/mail-notification.spec
index 58a6cf6..d8ab21c 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -12,6 +12,8 @@ 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
@@ -63,6 +65,8 @@ Evolution support for Mail Notification.
 %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
@@ -188,6 +192,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Mon May 24 2010 Dmitry Butskoy <Dmitry@Butskoy.name> - 5.4-20
+- change icon usage for Fedora 13 (#573809)
+- fix some memory failures (Mat Booth <fedora@matbooth.co.uk>)
+
 * Tue May  4 2010 Dmitry Butskoy <Dmitry@Butskoy.name> - 5.4-19
 - rebuilt with new evolution-data-server