[claws-mail] 3.7.9-3 merge fix for startup notification crash (#708192)

[Michael Schwendt]

commit e08e1e42cf727f56c7affb57cc14ac42d1bbca44
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Jun 4 19:45:08 2011 +0200

    3.7.9-3
    merge fix for startup notification crash (#708192)

 claws-mail-3.7.9-startup-notification.patch |   18 ++++++++++++++++++
 claws-mail.spec                             |    9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-3.7.9-startup-notification.patch b/claws-mail-3.7.9-startup-notification.patch
new file mode 100644
index 0000000..e1d4eb6
--- /dev/null
+++ b/claws-mail-3.7.9-startup-notification.patch
@@ -0,0 +1,18 @@
+Index: src/main.c
+===================================================================
+RCS file: //claws/src/main.c,v
+retrieving revision 1.115.2.237
+retrieving revision 1.115.2.238
+diff -u -r1.115.2.237 -r1.115.2.238
+--- src/main.c	10 Apr 2011 17:19:04 -0000	1.115.2.237
++++ src/main.c	30 Apr 2011 19:27:15 -0000	1.115.2.238
+@@ -331,7 +331,7 @@
+ 		gtk_widget_show(hack);
+ 	}
+ 
+-	xdisplay = gdk_display_get_default();
++	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	sn_display = sn_display_new(xdisplay,
+ 				sn_error_trap_push,
+ 				sn_error_trap_pop);
+
diff --git a/claws-mail.spec b/claws-mail.spec
index 29aced0..d5dd527 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,6 +1,6 @@
 Name:           claws-mail
 Version:        3.7.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
@@ -8,6 +8,8 @@ URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
 # http://www.colino.net/claws-mail/index.php?len=4&ver=3.7.9cvs2#3.7.9cvs2
 Patch0:         %{name}-%{version}cvs2.patch
+# http://www.colino.net/claws-mail/getpatchset.php?ver=3.7.9cvs18
+Patch1:         claws-mail-3.7.9-startup-notification.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
@@ -137,6 +139,7 @@ mails, verify signatures or sign and encrypt your own mails.
 %prep
 %setup -q
 %patch0 -p1 -b.3.7.9cvs2
+%patch1 -p0 -b .startup-notification
 
 %build
 %configure --enable-ipv6 \
@@ -249,6 +252,10 @@ rm -rf %{buildroot}
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Sat Jun  4 2011 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.9-3
+- merge fix for startup notification crash (#708192)
+
 * Mon Apr 11 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.9-2
 - include gnome-shell fix again (3.7.9cvs2)