talons

commit 5320c59e5e46d8c4b831f71aba35a662c6e05228
parent 936190571c9908e3df60d88ffa2ce8859d1761b6
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 30 Apr 2011 19:27:17 +0000

2011-04-30 [colin]	3.7.9cvs18

	* src/main.c
		Fix bug #2414, 'Claws segfaults on startup with
		notification plugin enabled". Thanks Christian
		Faulhammer for the patch.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
2
+-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-30 [colin]	3.7.9cvs18
+
+	* src/main.c
+		Fix bug #2414, 'Claws segfaults on startup with
+		notification plugin enabled". Thanks Christian
+		Faulhammer for the patch.
+
 2011-04-27 [colin]	3.7.9cvs17
 
 	* src/codeconv.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4169,3 +4169,4 @@
 ( cvs diff -u -r 1.395.2.427 -r 1.395.2.428 src/summaryview.c;  ) > 3.7.9cvs15.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/it/claws-mail-manual.xml;  ) > 3.7.9cvs16.patchset
 ( cvs diff -u -r 1.65.2.72 -r 1.65.2.73 src/codeconv.c;  ) > 3.7.9cvs17.patchset
+( cvs diff -u -r 1.115.2.237 -r 1.115.2.238 src/main.c;  ) > 3.7.9cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -331,7 +331,7 @@ static void startup_notification_complete(gboolean with_window)
 		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);