Re: Cone 0.59 released.

Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
Date: 2004-04-27
Initial Package Version: 0.59
Origin: Mr. Sam
Description: Fixes Compile Issues with GCC 3.4
 
diff -Naur cone-0.59.orig/cone/configscreen.C cone-0.59/cone/configscreen.C
--- cone-0.59.orig/cone/configscreen.C	2004-04-25 03:37:15.000000000 +0000
+++ cone-0.59/cone/configscreen.C	2004-04-27 22:38:07.824228871 +0000
@@ -29,6 +29,7 @@
 #include "specialfolder.H"
 
 #include <sstream>
+#include <errno.h>
 
 extern struct CustomColor color_misc_promptColor;
 extern struct CustomColor color_misc_inputField;
diff -Naur cone-0.59.orig/cone/cursesmessage.H cone-0.59/cone/cursesmessage.H
--- cone-0.59.orig/cone/cursesmessage.H	2004-03-28 22:44:37.000000000 +0000
+++ cone-0.59/cone/cursesmessage.H	2004-04-27 22:38:07.819229773 +0000
@@ -207,7 +207,7 @@
 					   mail::folder **,
 					   class mail::callback::disconnect &);
 
-	friend class ReformatTimer : public Timer {
+	class ReformatTimer : public Timer {
 	public:
 		CursesMessage *message;
 
diff -Naur cone-0.59.orig/cone/cursesmessagedisplay.C cone-0.59/cone/cursesmessagedisplay.C
--- cone-0.59.orig/cone/cursesmessagedisplay.C	2004-03-28 22:44:37.000000000 +0000
+++ cone-0.59/cone/cursesmessagedisplay.C	2004-04-27 22:38:07.828228150 +0000
@@ -27,6 +27,7 @@
 #include "libmail/smtpinfo.H"
 #include "maildir/maildirsearch.h"
 #include <sstream>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/cone/encryptionmenu.C cone-0.59/cone/encryptionmenu.C
--- cone-0.59.orig/cone/encryptionmenu.C	2003-09-14 19:20:55.000000000 +0000
+++ cone-0.59/cone/encryptionmenu.C	2004-04-27 22:38:07.832227428 +0000
@@ -20,6 +20,7 @@
 #include "passwordlist.H"
 
 #include <sstream>
+#include <errno.h>
 
 extern const char *gpgprog();
 
diff -Naur cone-0.59.orig/cone/gettext.C cone-0.59/cone/gettext.C
--- cone-0.59.orig/cone/gettext.C	2004-03-28 22:44:37.000000000 +0000
+++ cone-0.59/cone/gettext.C	2004-04-27 22:38:07.836226706 +0000
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include "unicode/unicode.h"
 #include "libmail/mail.H"
+#include <errno.h>
 
 #if HAVE_LANGINFO_H
 #include <langinfo.h>
diff -Naur cone-0.59.orig/cone/gpg.C cone-0.59/cone/gpg.C
--- cone-0.59.orig/cone/gpg.C	2004-04-13 02:04:33.000000000 +0000
+++ cone-0.59/cone/gpg.C	2004-04-27 22:38:07.841225804 +0000
@@ -21,6 +21,7 @@
 #include "wraptext.H"
 #include <vector>
 #include <set>
+#include <errno.h>
 
 extern char ucheck[];
 
diff -Naur cone-0.59.orig/cone/htmlparser.C cone-0.59/cone/htmlparser.C
--- cone-0.59.orig/cone/htmlparser.C	2003-09-30 03:31:49.000000000 +0000
+++ cone-0.59/cone/htmlparser.C	2004-04-27 22:38:07.847224722 +0000
@@ -12,6 +12,7 @@
 #include <sstream>
 #include <iostream>
 #include <iomanip>
+#include <errno.h>
 
 #include "libmail/mail.H"
 
diff -Naur cone-0.59.orig/cone/myfolder.H cone-0.59/cone/myfolder.H
--- cone-0.59.orig/cone/myfolder.H	2003-09-01 19:43:41.000000000 +0000
+++ cone-0.59/cone/myfolder.H	2004-04-27 22:38:07.816230315 +0000
@@ -134,7 +134,7 @@
 	};
 
 	// Predicate for std::sort()
-	friend class IndexSort {
+	class IndexSort {
 		myFolder &f;
 	public:
 		IndexSort(myFolder &F) : f(F) {}
@@ -229,7 +229,7 @@
 	size_t getCurrentMessage() const { return currentMessage; }
 	void setCurrentMessage(size_t n) { currentMessage=n; }
 
-	friend class iterator {
+	class iterator {
 
 		size_t n;
 
@@ -303,7 +303,7 @@
 
 	};
 
-	friend class const_iterator {
+	class const_iterator {
 
 		size_t n;
 
diff -Naur cone-0.59.orig/cone/myfolderfilter.C cone-0.59/cone/myfolderfilter.C
--- cone-0.59.orig/cone/myfolderfilter.C	2003-09-02 00:19:55.000000000 +0000
+++ cone-0.59/cone/myfolderfilter.C	2004-04-27 22:38:07.852223819 +0000
@@ -11,6 +11,7 @@
 #include "gettext.H"
 #include "tags.H"
 #include <sstream>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/curses/mycurses.H cone-0.59/curses/mycurses.H
--- cone-0.59.orig/curses/mycurses.H	2004-03-27 15:53:31.000000000 +0000
+++ cone-0.59/curses/mycurses.H	2004-04-27 22:38:07.765239516 +0000
@@ -487,8 +487,8 @@
 
 	static void setSuspendHook( void (*)(void) );
 
-private:
 	static void (*suspendedHook)(void);
+private:
 	static void suspendedStub(void);
 
 };
diff -Naur cone-0.59.orig/libmail/decoder.H cone-0.59/libmail/decoder.H
--- cone-0.59.orig/libmail/decoder.H	2003-05-27 14:09:08.000000000 +0000
+++ cone-0.59/libmail/decoder.H	2004-04-27 22:38:07.767239155 +0000
@@ -20,7 +20,7 @@
 // base64).  Each superclass decoder repeatedly invokes the decode() method,
 // with partial decoded contents as arguments.
 
-class mail::decoder {
+class decoder {
 public:
 	decoder();
 	virtual ~decoder();
diff -Naur cone-0.59.orig/libmail/imapfolder.C cone-0.59/libmail/imapfolder.C
--- cone-0.59.orig/libmail/imapfolder.C	2004-04-25 03:37:15.000000000 +0000
+++ cone-0.59/libmail/imapfolder.C	2004-04-27 22:38:07.782236449 +0000
@@ -32,6 +32,7 @@
 #include <ctype.h>
 #include <sstream>
 #include <limits.h>
+#include <errno.h>
 
 using namespace std;
 
@@ -3050,8 +3051,8 @@
 	string sizeNumStr="";
 
 	switch (searchInfo.criteria) {
-	case searchInfo.larger:
-	case searchInfo.smaller:
+	case searchParams::larger:
+	case searchParams::smaller:
 
 		{
 			unsigned long sizeNum=0;
@@ -3088,38 +3089,38 @@
 	string::const_iterator b, e;
 
 	switch (searchInfo.criteria) {
-	case searchInfo.replied:
+	case searchParams::replied:
 		cmd += " ANSWERED";
 		break;
-	case searchInfo.deleted:
+	case searchParams::deleted:
 		cmd += " DELETED";
 		break;
-	case searchInfo.draft:
+	case searchParams::draft:
 		cmd += " DRAFT";
 		break;
-	case searchInfo.unread:
+	case searchParams::unread:
 		cmd += " SEEN";
 		break;
 
 		// Header match
 		
-	case searchInfo.from:
+	case searchParams::from:
 		cmd += " FROM "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.to:
+	case searchParams::to:
 		cmd += " TO "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.cc:
+	case searchParams::cc:
 		cmd += " CC "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.bcc:
+	case searchParams::bcc:
 		cmd += " BCC "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.subject:
+	case searchParams::subject:
 		cmd += " SUBJECT "; hasParam2=true; param2=searchInfo.param2;
 		break;
 
-	case searchInfo.header:
+	case searchParams::header:
 
 		b=searchInfo.param1.begin();
 		e=searchInfo.param1.end();
@@ -3136,41 +3137,41 @@
 		cmd += " HEADER " + quoteSimple(searchInfo.param1)
 			+ " "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.body:
+	case searchParams::body:
 		cmd += " BODY "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.text:
+	case searchParams::text:
 		cmd += " TEXT "; hasParam2=true; param2=searchInfo.param2;
 		break;
 
 		// Internal date:
 
-	case searchInfo.before:
+	case searchParams::before:
 		cmd += " BEFORE "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.on:    
+	case searchParams::on:    
 		cmd += " ON "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.since:
+	case searchParams::since:
 		cmd += " SINCE "; hasParam2=true; param2=searchInfo.param2;
 		break;
 
 		// Sent date:
 
-	case searchInfo.sentbefore:
+	case searchParams::sentbefore:
 		cmd += " SENTBEFORE "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.senton:
+	case searchParams::senton:
 		cmd += " SENTON "; hasParam2=true; param2=searchInfo.param2;
 		break;
-	case searchInfo.sentsince:
+	case searchParams::sentsince:
 		cmd += " SENTSINCE "; hasParam2=true; param2=searchInfo.param2;
 		break;
 
-	case searchInfo.larger:
+	case searchParams::larger:
 		cmd += " LARGER " + sizeNumStr;
 		break;
-	case searchInfo.smaller:
+	case searchParams::smaller:
 		cmd += " SMALLER " + sizeNumStr;
 		break;
 	default:
diff -Naur cone-0.59.orig/libmail/mailtool.C cone-0.59/libmail/mailtool.C
--- cone-0.59.orig/libmail/mailtool.C	2004-04-25 03:37:15.000000000 +0000
+++ cone-0.59/libmail/mailtool.C	2004-04-27 22:38:07.813230856 +0000
@@ -28,6 +28,7 @@
 #include <ctype.h>
 
 #include <sstream>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/libmail/nntpgroupopen.C cone-0.59/libmail/nntpgroupopen.C
--- cone-0.59.orig/libmail/nntpgroupopen.C	2003-08-27 06:02:38.000000000 +0000
+++ cone-0.59/libmail/nntpgroupopen.C	2004-04-27 22:38:07.788235366 +0000
@@ -11,6 +11,7 @@
 #include "nntpnewsrc.H"
 #include <sstream>
 #include <fstream>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/libmail/nntplistactive.C cone-0.59/libmail/nntplistactive.C
--- cone-0.59.orig/libmail/nntplistactive.C	2003-06-07 22:45:12.000000000 +0000
+++ cone-0.59/libmail/nntplistactive.C	2004-04-27 22:38:07.791234825 +0000
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <sstream>
 #include <algorithm>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/libmail/rfcaddr.H cone-0.59/libmail/rfcaddr.H
--- cone-0.59.orig/libmail/rfcaddr.H	2003-05-27 14:09:09.000000000 +0000
+++ cone-0.59/libmail/rfcaddr.H	2004-04-27 22:38:07.786235727 +0000
@@ -20,7 +20,7 @@
 
 LIBMAIL_START
 
-class mail::address {
+class address {
 public:
 	std::string name;
 	std::string addr;
diff -Naur cone-0.59.orig/libmail/search.C cone-0.59/libmail/search.C
--- cone-0.59.orig/libmail/search.C	2003-07-23 15:26:42.000000000 +0000
+++ cone-0.59/libmail/search.C	2004-04-27 22:38:07.798233562 +0000
@@ -420,8 +420,8 @@
 		size_t n;
 
 		switch (searchInfo.criteria) {
-		case searchInfo.larger:
-		case searchInfo.smaller:
+		case searchParams::larger:
+		case searchParams::smaller:
 
 			my_callback.nextFunc=
 				&mail::searchOneMessage::checkNextHeader;
@@ -430,12 +430,12 @@
 						   my_callback);
 			return;
 
-		case searchInfo.before:
-		case searchInfo.on:
-		case searchInfo.since:
-		case searchInfo.sentbefore:
-		case searchInfo.senton:
-		case searchInfo.sentsince:
+		case searchParams::before:
+		case searchParams::on:
+		case searchParams::since:
+		case searchParams::sentbefore:
+		case searchParams::senton:
+		case searchParams::sentsince:
 
 			while (searchInfo.param2.size() > 0 &&
 			       isspace((unsigned char)searchInfo.param2[0]))
@@ -477,11 +477,11 @@
 						   my_callback);
 			return;
 
-		case searchInfo.from:
-		case searchInfo.to:
-		case searchInfo.cc:
-		case searchInfo.bcc:
-		case searchInfo.subject:
+		case searchParams::from:
+		case searchParams::to:
+		case searchParams::cc:
+		case searchParams::bcc:
+		case searchParams::subject:
 			my_callback.nextFunc=
 				&mail::searchOneMessage::checkFwdEnvelope;
 			ptr->readMessageAttributes(messageNumVector,
@@ -489,9 +489,9 @@
 						   my_callback);
 			return;
 
-		case searchInfo.header:
-		case searchInfo.body:
-		case searchInfo.text:
+		case searchParams::header:
+		case searchParams::body:
+		case searchParams::text:
 			mimeSearch.empty();
 			searchBuffer="";
 			my_callback.nextFunc=
@@ -501,10 +501,10 @@
 						   my_callback);
 			return;
 
-		case searchInfo.replied:
-		case searchInfo.deleted:
-		case searchInfo.draft:
-		case searchInfo.unread:
+		case searchParams::replied:
+		case searchParams::deleted:
+		case searchParams::draft:
+		case searchParams::unread:
 			break;
 		}
 	} catch (...) {
@@ -582,7 +582,7 @@
 		string bodySearch;
 
 		switch (searchInfo.criteria) {
-		case searchInfo.header:
+		case searchParams::header:
 
 			q=unicode_convert(searchInfo.param2.c_str(),
 					  searchCharset, &unicode_UTF8);
@@ -603,8 +603,8 @@
 			}
 			break;
 
-		case searchInfo.body:
-		case searchInfo.text:
+		case searchParams::body:
+		case searchParams::text:
 
 			u=NULL;
 
@@ -666,12 +666,12 @@
 	}
 
 	switch (searchInfo.criteria) {
-	case searchInfo.header:
+	case searchParams::header:
 		ptr->readMessageContent(messageNum, true, *hdrs, true, false,
 					my_callback);
 		break;
-	case searchInfo.body:
-	case searchInfo.text:
+	case searchParams::body:
+	case searchParams::text:
 		ptr->readMessageContentDecoded(messageNum, true, *hdrs,
 					       my_callback);
 		break;
@@ -721,14 +721,14 @@
 void mail::searchOneMessage::search(const mail::envelope &envelope)
 {
 	switch (searchInfo.criteria) {
-	case searchInfo.from:
-	case searchInfo.to:
-	case searchInfo.cc:
-	case searchInfo.bcc:
-	case searchInfo.subject:
-	case searchInfo.sentbefore:
-	case searchInfo.senton:
-	case searchInfo.sentsince:
+	case searchParams::from:
+	case searchParams::to:
+	case searchParams::cc:
+	case searchParams::bcc:
+	case searchParams::subject:
+	case searchParams::sentbefore:
+	case searchParams::senton:
+	case searchParams::sentsince:
 
 		searchEnvelope(envelope);
 		break;
@@ -742,25 +742,25 @@
 	string searchStr;
 
 	switch (searchInfo.criteria) {
-	case searchInfo.from:
+	case searchParams::from:
 		searchStr= mail::address::toString("", envelope.from);
 		break;
-	case searchInfo.to:
+	case searchParams::to:
 		searchStr= mail::address::toString("", envelope.to);
 		break;
-	case searchInfo.cc:
+	case searchParams::cc:
 		searchStr= mail::address::toString("", envelope.cc);
 		break;
-	case searchInfo.bcc:
+	case searchParams::bcc:
 		searchStr= mail::address::toString("", envelope.bcc);
 		break;
-	case searchInfo.subject:
+	case searchParams::subject:
 		searchStr=envelope.subject;
 		break;
 
-	case searchInfo.sentbefore:
-	case searchInfo.senton:
-	case searchInfo.sentsince:
+	case searchParams::sentbefore:
+	case searchParams::senton:
+	case searchParams::sentsince:
 
 		doDateCmp(envelope.date);
 		return;
@@ -872,9 +872,9 @@
 void mail::searchOneMessage::search(time_t internaldate)
 {
 	switch (searchInfo.criteria) {
-	case searchInfo.before:
-	case searchInfo.on:
-	case searchInfo.since:
+	case searchParams::before:
+	case searchParams::on:
+	case searchParams::since:
 		doDateCmp(internaldate);
 		break;
 	default:
@@ -892,11 +892,11 @@
 
 	if (!i.fail())
 		switch (searchInfo.criteria) {
-		case searchInfo.larger:
+		case searchParams::larger:
 			if (messageSize > b)
 				searchFlag=true;
 			break;
-		case searchInfo.smaller:
+		case searchParams::smaller:
 			if (messageSize < b)
 				searchFlag=true;
 			break;
@@ -908,14 +908,14 @@
 void mail::searchOneMessage::search(const mail::mimestruct &structureInfo)
 {
 	switch (searchInfo.criteria) {
-	case searchInfo.from:
-	case searchInfo.to:
-	case searchInfo.cc:
-	case searchInfo.bcc:
-	case searchInfo.subject:
-	case searchInfo.header:
-	case searchInfo.body:
-	case searchInfo.text:
+	case searchParams::from:
+	case searchParams::to:
+	case searchParams::cc:
+	case searchParams::bcc:
+	case searchParams::subject:
+	case searchParams::header:
+	case searchParams::body:
+	case searchParams::text:
 
 		structureBuffer=structureInfo;
 
@@ -1079,21 +1079,21 @@
 		diff= -1;
 
 	switch (searchInfo.criteria) {
-	case searchInfo.on:
-	case searchInfo.senton:
+	case searchParams::on:
+	case searchParams::senton:
 		if (diff == 0)
 			searchFlag=true;
 		break;
 
-	case searchInfo.before:
-	case searchInfo.sentbefore:
+	case searchParams::before:
+	case searchParams::sentbefore:
 
 		if (diff < 0)
 			searchFlag=true;
 		break;
 
-	case searchInfo.since:
-	case searchInfo.sentsince:
+	case searchParams::since:
+	case searchParams::sentsince:
 
 		if (diff >= 0)
 			searchFlag=true;
@@ -1174,22 +1174,22 @@
 		uid=i.uid;
 
 		switch (searchInfo.criteria) {
-		case searchInfo.replied:
+		case searchParams::replied:
 			if (searchInfo.searchNot ? !i.replied:i.replied)
 				successArray.push_back(uid);
 			++nextMsgNum;
 			continue;
-		case searchInfo.deleted:
+		case searchParams::deleted:
 			if (searchInfo.searchNot ? !i.deleted:i.deleted)
 				successArray.push_back(uid);
 			++nextMsgNum;
 			continue;
-		case searchInfo.draft:
+		case searchParams::draft:
 			if (searchInfo.searchNot ? !i.draft:i.draft)
 				successArray.push_back(uid);
 			++nextMsgNum;
 			continue;
-		case searchInfo.unread:
+		case searchParams::unread:
 			if (searchInfo.searchNot ? !i.unread:i.unread)
 				successArray.push_back(uid);
 			++nextMsgNum;
diff -Naur cone-0.59.orig/libmail/smap.C cone-0.59/libmail/smap.C
--- cone-0.59.orig/libmail/smap.C	2004-04-25 03:37:16.000000000 +0000
+++ cone-0.59/libmail/smap.C	2004-04-27 22:38:07.802232840 +0000
@@ -13,6 +13,7 @@
 #include <limits.h>
 #include <iostream>
 #include <sstream>
+#include <errno.h>
 #include "rfc822/rfc822.h"
 
 using namespace std;
diff -Naur cone-0.59.orig/libmail/smaplist.C cone-0.59/libmail/smaplist.C
--- cone-0.59.orig/libmail/smaplist.C	2004-04-25 03:37:16.000000000 +0000
+++ cone-0.59/libmail/smaplist.C	2004-04-27 22:38:07.805232299 +0000
@@ -9,6 +9,7 @@
 #include "smaplist.H"
 #include <ctype.h>
 #include <sstream>
+#include <errno.h>
 
 using namespace std;
 
diff -Naur cone-0.59.orig/libmail/smtpfolder.H cone-0.59/libmail/smtpfolder.H
--- cone-0.59.orig/libmail/smtpfolder.H	2003-06-07 22:45:13.000000000 +0000
+++ cone-0.59/libmail/smtpfolder.H	2004-04-27 22:38:07.807231938 +0000
@@ -83,7 +83,7 @@
 //
 // addMessage object created by smtpFolder::addMessage()
 
-class mail::smtpAddMessage : public addMessage {
+class smtpAddMessage : public addMessage {
 
 	ptr<smtp> myServer;
 	smtpInfo myInfo;