added version check in configure.in

disable error popup if requested
bugfix in ssl_gets

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 54b6534c3e6dbe8afc690596916531253a5e4030..702ab0966f06ff8f5d29afea3f484852d7354444 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,22 @@
+2001-08-05 [christoph]
+
+       * configure.in
+               debian autoconf needs version check to find
+               correct autoconf version. if the file is
+               named configure.in 2.13 is used, which does
+               not work with this configure.in script.
+               other solution would be to rename the script
+               to configure.ac as suggested in the autoconf
+               manual.
+
+       * src/inc.c
+               disable final error popup if popups are
+               diabled in config
+
+       * src/socket.c
+               bugfix in ssl_gets
+               fixes IMAP over SSL problem
+
 2001-08-03 [paul]
 
        * configure.in

diff --git a/configure.in b/configure.in
index b2a8634d0484187853c69c3dc9072e8397a15a11..69ee4dc5415493cc0bb633b356090728eaf1fd35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,6 @@
+dnl check for needed autoconf version
+AC_PREREQ(2.50)
+
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
 PACKAGE=sylpheed

diff --git a/src/inc.c b/src/inc.c
index 568dee1eb19e1de07a52c2e12f4db96cdb58a3c4..0d9acdbf4ef12904f56546362b807504304dfeb1 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -498,8 +498,10 @@ static void inc_start(IncProgressDialog *inc_dialog)
                num++;
        }
 
-       if (error_num)
-               alertpanel_error(_("Some errors occured while getting mail."));
+       if(!prefs_common.noerrorpanel) {
+               if (error_num)
+                       alertpanel_error(_("Some errors occured while getting mail."));
+       }
 
        while (inc_dialog->queue_list != NULL) {
                session = inc_dialog->queue_list->data;

diff --git a/src/socket.c b/src/socket.c
index 4a8f73f6e0a5efb171869dadfcad736f8be4525e..0468b2ce085f32e1110a1ea8764e068855a24034 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -505,7 +505,7 @@ gint ssl_gets(SSL *ssl, gchar *buf, gint len)
        }
 
        *buf2 = '\0';
-       return n;
+       return count;
 }
 #endif