2004-09-27 [colin] 0.9.12cvs104.1
authorColin Leroy <colin@colino.net>
Mon, 27 Sep 2004 11:48:46 +0000 (11:48 +0000)
committerColin Leroy <colin@colino.net>
Mon, 27 Sep 2004 11:48:46 +0000 (11:48 +0000)
* src/main.c
Sync with HEAD (revert 0.9.12cvs101)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/main.c

index c4c9fa42e4d4239794c8d67f723a439ca4200744..327ed45b1d62a540049b968f800784b35e2679e1 100644 (file)
@@ -1,3 +1,8 @@
+2004-09-27 [colin]     0.9.12cvs104.1
+
+       * src/main.c
+               Sync with HEAD (revert 0.9.12cvs101)
+
 2004-09-24 [colin]     0.9.12cvs103.2
 
        * src/wizard.c
index d27baa80da904d6d0eb6e72478d4fb2f4133e6c0..3271c252db367190fdb9a0c710c23d07f5c62dd1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/action.c; ) > 0.9.12cvs102.3.patchset
 ( cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.h; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.h; ) > 0.9.12cvs103.1.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/wizard.c; ) > 0.9.12cvs103.2.patchset
+( cvs diff -u -r 1.115.2.18 -r 1.115.2.19 src/main.c; ) > 0.9.12cvs104.1.patchset
index bef093a45773211dc7c786b009f6754d2f9adf31..b77abb7e41572876aefa98354da70cf31129b1cf 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+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}
index aa2d0140663426c755a180f9c3e40e06b478a10f..60e35ce4b9a7978abce58dffbc222cab137f63c7 100644 (file)
@@ -495,10 +495,10 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
-       plugin_unload_all("GTK2");
-
        main_window_destroy(mainwin);
        
+       plugin_unload_all("GTK2");
+
        prefs_toolbar_done();
 
        addressbook_destroy();