From 82b3388b9cf9b2244a88ffe4c8a22814a1e203d3 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Fri, 17 Sep 2004 06:29:47 +0000
Subject: [PATCH] 2004-09-17 [colin]	0.9.12cvs101.1

	* ChangeLog.claws
	* src/main.c
		Sync with HEAD (fix segs at exit)
---
 ChangeLog-gtk2.claws |  6 ++++++
 ChangeLog.claws      | 12 ++++++++++++
 PATCHSETS            |  1 +
 configure.ac         |  4 ++--
 src/main.c           |  4 ++--
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 693e248d4..f8ee04917 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-09-17 [colin]	0.9.12cvs101.1
+
+	* ChangeLog.claws
+	* src/main.c
+		Sync with HEAD (fix segs at exit)
+
 2004-09-14 [colin]	0.9.12cvs99.5
 
 	* src/common/socket.c
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 794bb51a5..7ba51f99d 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2004-09-17 [colin]	0.9.12cvs101
+
+	* src/main.c
+		Fix segfaults when quitting. valgrind says:
+			==12144== Invalid read of size 4
+			==12144==    at 0x80D7DDA: messageview_is_visible (messageview.c:938)
+			[...]
+			==12144==  Address 0x1BF1BD30 is 56 bytes inside a block of size 72 free'd
+			[...]
+			==12144==    by 0x80CC671: exit_sylpheed (main.c:498)
+
+
 2004-09-13 [christoph]	0.9.12cvs100
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
index aa03ad0c1..732a3f68a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -169,3 +169,4 @@
 ( cvs diff -u -r 1.2504.2.19 -r 1.2504.2.20 ChangeLog.claws; cvs diff -u -r 1.213.2.16 -r 1.213.2.17 src/folder.c; ) > 0.9.12cvs99.3.patchset
 ( cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/action.c; ) > 0.9.12cvs99.4.patchset
 ( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/socket.c; cvs diff -u -r 1.100.2.4 -r 1.100.2.5 AUTHORS; ) > 0.9.12cvs99.5.patchset
+( cvs diff -u -r 1.2504.2.20 -r 1.2504.2.21 ChangeLog.claws; cvs diff -u -r 1.115.2.17 -r 1.115.2.18 src/main.c; ) > 0.9.12cvs101.1.patchset
diff --git a/configure.ac b/configure.ac
index cceca0e4a..dff706dc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=99
+EXTRA_VERSION=101
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.5
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/main.c b/src/main.c
index 60e35ce4b..aa2d01406 100644
--- a/src/main.c
+++ b/src/main.c
@@ -495,10 +495,10 @@ static void exit_sylpheed(MainWindow *mainwin)
 
 	lock_socket_remove();
 
-	main_window_destroy(mainwin);
-	
 	plugin_unload_all("GTK2");
 
+	main_window_destroy(mainwin);
+	
 	prefs_toolbar_done();
 
 	addressbook_destroy();