From 328fc93128987cce0fb36f9101412c5a48e413d9 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Sat, 4 Aug 2001 23:52:11 +0000
Subject: [PATCH] added version check in configure.in disable error popup if
 requested bugfix in ssl_gets

---
 ChangeLog.claws | 19 +++++++++++++++++++
 configure.in    |  3 +++
 src/inc.c       |  6 ++++--
 src/socket.c    |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 54b6534c3..702ab0966 100644
--- 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 b2a8634d0..69ee4dc54 100644
--- 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 568dee1eb..0d9acdbf4 100644
--- 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 4a8f73f6e..0468b2ce0 100644
--- 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
 
-- 
2.25.1