talons

commit 0783e98428e9c2da9ea71d444c41a706bd64aa8c
parent a66c23334c5c9b2cac26bdf39fd9544950f91006
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 10 Oct 2012 08:12:10 +0000

2012-10-10 [colin]	3.8.1cvs90

	* src/inc.c
	* src/mbox.c
	* src/common/smtp.c
	* src/common/smtp.h
		Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
		Patch by "madroach"

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/smtp.c
 | 
14
+++++++-------
M
src/common/smtp.h
 | 
2
+-
M
src/inc.c
 | 
4
++--
M
src/mbox.c
 | 
4
++--

7 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-10 [colin]	3.8.1cvs90
+
+	* src/inc.c
+	* src/mbox.c
+	* src/common/smtp.c
+	* src/common/smtp.h
+		Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
+		Patch by "madroach"
+
 2012-10-10 [colin]	3.8.1cvs89
 
 	* autogen.sh
diff --git a/PATCHSETS b/PATCHSETS
@@ -4464,3 +4464,4 @@
 ( cvs diff -u -r 1.36.2.202 -r 1.36.2.203 src/common/utils.c;  ) > 3.8.1cvs87.patchset
 ( cvs diff -u -r 1.382.2.614 -r 1.382.2.615 src/compose.c;  ) > 3.8.1cvs88.patchset
 ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 autogen.sh;  ) > 3.8.1cvs89.patchset
+( cvs diff -u -r 1.149.2.111 -r 1.149.2.112 src/inc.c;  cvs diff -u -r 1.28.2.53 -r 1.28.2.54 src/mbox.c;  cvs diff -u -r 1.11.2.32 -r 1.11.2.33 src/common/smtp.c;  cvs diff -u -r 1.6.2.21 -r 1.6.2.22 src/common/smtp.h;  ) > 3.8.1cvs90.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=89
+EXTRA_VERSION=90
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/smtp.c b/src/common/smtp.c
@@ -125,7 +125,7 @@ static void smtp_session_destroy(Session *session)
 
 gint smtp_from(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *mail_size = NULL;
 
 	cm_return_val_if_fail(session->from != NULL, SM_ERROR);
@@ -189,7 +189,7 @@ static gint smtp_auth(SMTPSession *session)
 
 static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	switch (session->auth_type) {
 	case SMTPAUTH_LOGIN:
@@ -265,7 +265,7 @@ static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
 
 static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_AUTH_LOGIN_PASS;
 
@@ -285,7 +285,7 @@ static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
 
 static gint smtp_ehlo(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_EHLO;
 
@@ -364,7 +364,7 @@ static gint smtp_auth_cram_md5(SMTPSession *session)
 
 static gint smtp_auth_plain(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	/* 
  	 * +1      +1      +1
@@ -429,7 +429,7 @@ static gint smtp_auth_login(SMTPSession *session)
 
 static gint smtp_helo(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 
 	session->state = SMTP_HELO;
 
@@ -444,7 +444,7 @@ static gint smtp_helo(SMTPSession *session)
 
 static gint smtp_rcpt(SMTPSession *session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *to;
 
 	cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
diff --git a/src/common/smtp.h b/src/common/smtp.h
@@ -32,7 +32,7 @@ typedef struct _SMTPSession	SMTPSession;
 
 #define SMTP_SESSION(obj)	((SMTPSession *)obj)
 
-#define MSGBUFSIZE		8192
+#define MESSAGEBUFSIZE		8192
 
 typedef enum
 {
diff --git a/src/inc.c b/src/inc.c
@@ -89,7 +89,7 @@ static GdkPixbuf *currentpix;
 static GdkPixbuf *errorpix;
 static GdkPixbuf *okpix;
 
-#define MSGBUFSIZE	8192
+#define MESSAGEBUFSIZE	8192
 
 static void inc_update_stats(gint new_msgs);
 static void inc_finished		(MainWindow		*mainwin,
@@ -968,7 +968,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
 static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
 					     IncSession *inc_session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
 	gchar *total_size_str;
 	gint cur_total;
diff --git a/src/mbox.c b/src/mbox.c
@@ -53,7 +53,7 @@
 #include "alertpanel.h"
 #include "statusbar.h"
 
-#define MSGBUFSIZE	8192
+#define MESSAGEBUFSIZE	8192
 
 #ifdef HAVE_FGETS_UNLOCKED
 #define SC_FGETS fgets_unlocked
@@ -83,7 +83,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
 /* return values: -1 error, >=0 number of msgs added */
 {
 	FILE *mbox_fp;
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *tmp_file;
 	gint msgs = 0;
 	gint lines;