0.9.3claws20

* src/common/session.c
        fix opening of SSL connections

* src/plugins/image_viewer/Makefile.am
        add OPENSSL_CFLAGS (we should find a better solution to remove
        this dependencies if they are not required)

* src/plugins/spamassassin/spamassassin.c
        remove setlocale workaround (fixed in libspamc)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 58290961660815b5db18d7cb3929208ea27fd1a8..a82218c46ea2dbae2349d22036dc02ecde9f3a7c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2003-07-17 [christoph] 0.9.3claws20
+
+       * src/common/session.c
+               fix opening of SSL connections
+
+       * src/plugins/image_viewer/Makefile.am
+               add OPENSSL_CFLAGS (we should find a better solution to remove
+               this dependencies if they are not required)
+
+       * src/plugins/spamassassin/spamassassin.c
+               remove setlocale workaround (fixed in libspamc)
+
 2003-07-17 [alfons]    0.9.3claws19
 
        * src/common/hooks.[ch]

diff --git a/configure.ac b/configure.ac
index 650118e637dd6686a06026a22b3b45c31235bd62..46213c2b102d890e6ed4ccac129bab1a113754c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws19
+EXTRA_VERSION=claws20
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/common/session.c b/src/common/session.c
index 6a29292d46bc6cb930bf0a8a305f5b79a40eaca6..748919518d81f6c2de5f278a088c07205b72066f 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -134,7 +134,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
 
        session->sock = sock;
 
-#if USE_SSL
+#if USE_OPENSSL
        if (session->ssl_type == SSL_TUNNEL) {
                sock_set_nonblocking_mode(sock, FALSE);
                if (!ssl_init_socket(sock)) {

diff --git a/src/plugins/image_viewer/Makefile.am b/src/plugins/image_viewer/Makefile.am
index 479d4ea4783ce38069ac5e87c9c0de4322374fae..116e1a8da075c7669e958d5c9b00fcc180df6707 100644 (file)
--- a/src/plugins/image_viewer/Makefile.am
+++ b/src/plugins/image_viewer/Makefile.am
@@ -23,4 +23,5 @@ CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GDK_IMLIB_CFLAGS) \
-       $(GDK_PIXBUF_CFLAGS)
+       $(GDK_PIXBUF_CFLAGS) \
+       $(OPENSSL_CFLAGS)

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 1da9d8f367359c9a1aec07c4d9f4d26738fcd695..dfee750fe01d8113565603a5b42d048654926bec 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -102,10 +102,6 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 
        debug_print("Filtering message %d\n", msginfo->msgnum);
 
-       /* remember old locale and set it to C */
-       Xstrdup_a(oldlocale, setlocale(LC_ALL, NULL), return FALSE);
-       setlocale(LC_ALL, "C");
-
        if (lookup_host(config.hostname, config.port, &addr) != EX_OK) {
                debug_print("failed to look up spamd host\n");
                return FALSE;
@@ -139,7 +135,6 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 
        message_cleanup(&m);
        fclose(fp);
-       setlocale(LC_ALL, oldlocale);
 
        if (is_spam) {
                debug_print("message is spam\n");