2004-09-27 [paul] 0.9.12cvs104

	* src/main.c
		revert 0.9.12cvs101, it causes another segfault

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ebb838e671f3bbd82852f1c586cbd0ccef5187cb..a700409be6a76a61d9d36f8a47c7da6531a8fdd1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-09-27 [paul]      0.9.12cvs104
+
+       * src/main.c
+               revert 0.9.12cvs101, it causes another segfault
+
+

 2004-09-23 [christoph] 0.9.12cvs103
 
        * src/plugins/spamassassin/libspamc.[ch]
 2004-09-23 [christoph] 0.9.12cvs103
 
        * src/plugins/spamassassin/libspamc.[ch]

diff --git a/PATCHSETS b/PATCHSETS
index 88b2559dfc7ccf6e24b4a015fb742ae0a778e16a..603186e6e647c6ce8ccb3aa637638b6b1516bce0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -86,3 +86,4 @@
 ( cvs diff -u -r 1.143 -r 1.144 src/main.c; ) > 0.9.12cvs101.patchset
 ( cvs diff -u -r 1.442 -r 1.443 ChangeLog; cvs diff -u -r 1.437 -r 1.438 ChangeLog.jp; cvs diff -u -r 1.176 -r 1.177 src/inc.c; ) > 0.9.12cvs102.patchset
 ( cvs diff -u -r 1.6 -r 1.7 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.5 -r 1.6 src/plugins/spamassassin/libspamc.h; cvs diff -u -r 1.4 -r 1.5 src/plugins/spamassassin/utils.c; cvs diff -u -r 1.4 -r 1.5 src/plugins/spamassassin/utils.h; ) > 0.9.12cvs103.patchset
 ( cvs diff -u -r 1.143 -r 1.144 src/main.c; ) > 0.9.12cvs101.patchset
 ( cvs diff -u -r 1.442 -r 1.443 ChangeLog; cvs diff -u -r 1.437 -r 1.438 ChangeLog.jp; cvs diff -u -r 1.176 -r 1.177 src/inc.c; ) > 0.9.12cvs102.patchset
 ( cvs diff -u -r 1.6 -r 1.7 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.5 -r 1.6 src/plugins/spamassassin/libspamc.h; cvs diff -u -r 1.4 -r 1.5 src/plugins/spamassassin/utils.c; cvs diff -u -r 1.4 -r 1.5 src/plugins/spamassassin/utils.h; ) > 0.9.12cvs103.patchset

+( cvs diff -u -r 1.144 -r 1.145 src/main.c; ) > 0.9.12cvs104.patchset

diff --git a/configure.ac b/configure.ac
index a1d14607763bfcde92e5854b33de4e3ec2e28db6..3b4dc15a36925519adcbbdbd7769e54712ae4cc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=103
+EXTRA_VERSION=104

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/main.c b/src/main.c
index 404362a8a1c57673d299ae3155a3a13bb2aac4bf..428078e9cc8dd3025d326e2e99e3cf623c1a7024 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -486,10 +486,10 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
 
        lock_socket_remove();
 

-       plugin_unload_all("GTK");
-

        main_window_destroy(mainwin);
        
        main_window_destroy(mainwin);
        

+       plugin_unload_all("GTK");
+

        prefs_toolbar_done();
 
        addressbook_destroy();
        prefs_toolbar_done();
 
        addressbook_destroy();