2005-03-21 [holger] 1.9.6cvs7
authorHolger Berndt <hb@claws-mail.org>
Mon, 21 Mar 2005 05:21:43 +0000 (05:21 +0000)
committerHolger Berndt <hb@claws-mail.org>
Mon, 21 Mar 2005 05:21:43 +0000 (05:21 +0000)
* src/plugins/spamassassin/spamassassin.c
Sync with HEAD
(unregister hook on failed plugin init)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/plugins/spamassassin/spamassassin.c

index 3fabd989f81fbf30f8336283bf70b59d7df24c92..602880e789c650a7aa5411c18570bee8ff9d314c 100644 (file)
@@ -1,3 +1,9 @@
+2005-03-21 [holger]    1.9.6cvs7
+
+       * src/plugins/spamassassin/spamassassin.c
+               Sync with HEAD
+               (unregister hook on failed plugin init)
+
 2005-03-20 [colin]     1.9.6cvs6
 
        * src/common/plugin.c
index 088f3c8d0878c6bb8eb675b03380feacbd9bab7f..4fd5036a8cd6484e01e71a711eab9079c41bc55d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.30.2.10 -r 1.30.2.11 src/prefs_toolbar.c; ) > 1.9.6cvs4.patchset
 ( cvs diff -u -r 1.382.2.112 -r 1.382.2.113 src/compose.c; ) > 1.9.6cvs5.patchset
 ( cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/common/plugin.c; ) > 1.9.6cvs6.patchset
+( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/plugins/spamassassin/spamassassin.c; ) > 1.9.6cvs7.patchset
index cf91905c589ba57eed01ecf0f84c0bc7ec6e4971..a46ee490ff3b0891a8d2bd37e3e78e6fbe0baead 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 2492f21a90b56ff48f010b8a48f812a447511415..c35607158971bb08a44d16881f8aa06ebc0b3ad5 100644 (file)
@@ -298,6 +298,7 @@ gint plugin_init(gchar **error)
 
        username = g_get_user_name();
        if (username == NULL) {
+               hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
                *error = g_strdup("Failed to get username");
                return -1;
        }