2005-12-02 [paul] 1.9.100cvs55
authorPaul Mangan <paul@claws-mail.org>
Fri, 2 Dec 2005 15:07:20 +0000 (15:07 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 2 Dec 2005 15:07:20 +0000 (15:07 +0000)
* src/plugins/clamav/clamav_plugin.c
* src/plugins/clamav/clamav_plugin.h
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/spamassassin/spamassassin.c
* src/plugins/spamassassin/spamassassin.h
* src/plugins/spamassassin/spamassassin_gtk.c
unregister prefs pages on unloading, thus
preventing a crash
(thanks to Colin for the hint)

ChangeLog
PATCHSETS
configure.ac
src/plugins/clamav/clamav_plugin.c
src/plugins/clamav/clamav_plugin.h
src/plugins/clamav/clamav_plugin_gtk.c
src/plugins/spamassassin/spamassassin.c
src/plugins/spamassassin/spamassassin.h
src/plugins/spamassassin/spamassassin_gtk.c

index d4e5a520cbc83f03fc83d50e96e6464da677c20b..ca7f7d8c69f1a805165bbe7afc6d5056d182146a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-02 [paul]      1.9.100cvs55
+
+       * src/plugins/clamav/clamav_plugin.c
+       * src/plugins/clamav/clamav_plugin.h
+       * src/plugins/clamav/clamav_plugin_gtk.c
+       * src/plugins/spamassassin/spamassassin.c
+       * src/plugins/spamassassin/spamassassin.h
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               unregister prefs pages on unloading, thus
+               preventing a crash
+               (thanks to Colin for the hint)
+
 2005-12-02 [wwp]       1.9.100cvs54
 
        * src/quote_fmt.h
index 81989cef3af29d52b9b1d537e9a869ed569e3a5d..b4f24a1194095c0cd99ce9b05b5b735e9ba649d1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.198 -r 1.382.2.199 src/compose.c;  cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/prefs_template.c;  cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/quote_fmt.h;  cvs diff -u -r 1.22.2.14 -r 1.22.2.15 src/quote_fmt_parse.y;  ) > 1.9.100cvs52.patchset
 ( cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 1.9.100cvs53.patchset
 ( cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/quote_fmt.h;  cvs diff -u -r 1.22.2.15 -r 1.22.2.16 src/quote_fmt_parse.y;  ) > 1.9.100cvs54.patchset
+( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/plugins/clamav/clamav_plugin.h;  cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.18.2.13 -r 1.18.2.14 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.15 -r 1.23.2.16 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 1.9.100cvs55.patchset
index 107dade43bb7e0b3fe2714431f7a85390388a5c5..abeecb56c2007692f4942d3884e9aaed647704c3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a1aa95ede589afc5b6ae8f03b269a83351d35386..101ec938ae98f4811ff5c0e61c74c4cfdbfbc6c9 100644 (file)
@@ -239,6 +239,8 @@ void plugin_done(void)
        hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        g_free(config.clamav_save_folder);
        cl_free(cl_database);
+       clamav_gtk_done();
+
        debug_print("ClamAV plugin unloaded\n");
 }
 
index ad812480269a2e5b66aabc51cbaa74b57b6f2a17..2a40d2e6838cee50eb63216b861a048440b35dcd 100644 (file)
@@ -39,5 +39,6 @@ ClamAvConfig *clamav_get_config                 (void);
 void         clamav_save_config          (void);
 void         clamav_set_message_callback (MessageCallback callback);
 gint         clamav_gtk_init(void);
+void         clamav_gtk_done(void);
 
 #endif
index 977d75606557ef5fc04c6a90a5a4570f59e3ecfa..ac3c5511c28d0bc703a1367d6536d8033d6dbb0e 100644 (file)
@@ -229,3 +229,8 @@ gint clamav_gtk_init(void)
        debug_print("ClamAV GTK plugin loaded\n");
        return 0;       
 }
+
+void clamav_gtk_done(void)
+{
+        prefs_gtk_unregister_page((PrefsPage *) &clamav_page);
+}
index 37ef74af3bdeb9ea98637003866904a5a9d52dc2..1a52c10f79efa30dae7426d621acee885e03afee 100644 (file)
@@ -320,6 +320,7 @@ void plugin_done(void)
        hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        g_free(config.hostname);
        g_free(config.save_folder);
+       spamassassin_gtk_done();
 
        debug_print("Spamassassin plugin unloaded\n");
 }
index 466f373ea2ac2286b66bc300f28462db8d47def0..797495071a9f08eea1e29723fd93a2a24f89487d 100644 (file)
@@ -49,5 +49,6 @@ SpamAssassinConfig *spamassassin_get_config         (void);
 void               spamassassin_save_config          (void);
 void               spamassassin_set_message_callback (MessageCallback callback);
 gint spamassassin_gtk_init(void);
+void spamassassin_gtk_done(void);
 
 #endif
index ec6e3083a6357e1a62edb7d0d3b7a3be47594b51..04644b382ddc29c89abf06364fbb7efc4b8fcc1a 100644 (file)
@@ -467,3 +467,8 @@ gint spamassassin_gtk_init(void)
        debug_print("SpamAssassin GTK plugin loaded\n");
        return 0;       
 }
+
+void spamassassin_gtk_done(void)
+{
+        prefs_gtk_unregister_page((PrefsPage *) &spamassassin_page);
+}