From 714fc9b4492360587a49a96f78c8b7cb42a0df51 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 26 Oct 2005 20:20:05 +0000 Subject: [PATCH] * Bumped internal version number to 6.31. Minimum Citadel server required is version 6.61. --- webcit/ChangeLog | 4 ++++ webcit/calendar_tools.c | 7 +++---- webcit/groupdav_propfind.c | 2 ++ webcit/groupdav_put.c | 2 -- webcit/html2html.c | 3 ++- webcit/messages.c | 11 ++++------- webcit/rss.c | 3 ++- webcit/webcit.h | 6 +++--- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 8d21fc313..50dfd0af5 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,5 +1,9 @@ $Id$ +Wed Oct 26 16:19:24 EDT 2005 ajc +* Bumped internal version number to 6.31. Minimum Citadel server required + is version 6.61. + Wed Oct 26 12:09:20 EDT 2005 ajc * webcit.c: msgesc() no longer inserts backslashes before every single-quote appearing in the quoted or forwarded message. diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c index fa8bd9020..3fbab7eec 100644 --- a/webcit/calendar_tools.c +++ b/webcit/calendar_tools.c @@ -250,7 +250,7 @@ void partstat_as_string(char *buf, icalproperty *attendee) { icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { icalcomponent *encaps; - lprintf(9, "ical_encapsulate_subcomponent() called\n"); + /* lprintf(9, "ical_encapsulate_subcomponent() called\n"); */ if (subcomp == NULL) { lprintf(3, "ERROR: called with NULL argument!\n"); @@ -261,14 +261,13 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { * don't bother ... just return itself. */ if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) { - lprintf(9, "Already encapsulated. Returning itself.\n"); return subcomp; } /* Encapsulate the VEVENT component into a complete VCALENDAR */ encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT); if (encaps == NULL) { - lprintf(3, "Error at %s:%d - could not allocate component!\n", + lprintf(3, "%s:%d: Error - could not allocate component!\n", __FILE__, __LINE__); return NULL; } @@ -280,7 +279,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) { icalcomponent_add_property(encaps, icalproperty_new_version("2.0")); /* Encapsulate the subcomponent inside */ - lprintf(9, "Doing the encapsulation\n"); + /* lprintf(9, "Doing the encapsulation\n"); */ icalcomponent_add_component(encaps, subcomp); /* Convert all timestamps to UTC so we don't have to deal with diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c index 685ba410e..c6f1bbdd2 100644 --- a/webcit/groupdav_propfind.c +++ b/webcit/groupdav_propfind.c @@ -158,9 +158,11 @@ void groupdav_propfind(char *dav_pathname) { extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname); extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid); + /* lprintf(9, "dav_pathname: %s\n", dav_pathname); lprintf(9, "dav_roomname: %s\n", dav_roomname); lprintf(9, " dav_uid: %s\n", dav_uid); + */ /* * If the room name is blank, the client is requesting a diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c index a968ccd57..79a0da129 100644 --- a/webcit/groupdav_put.c +++ b/webcit/groupdav_put.c @@ -62,9 +62,7 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch, * version, so we fail... */ if (strlen(dav_ifmatch) > 0) { - lprintf(9, "dav_ifmatch: %s\n", dav_ifmatch); old_msgnum = locate_message_by_uid(dav_uid); - lprintf(9, "old_msgnum: %ld\n", old_msgnum); if (atol(dav_ifmatch) != old_msgnum) { wprintf("HTTP/1.1 412 Precondition Failed\r\n"); lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n", diff --git a/webcit/html2html.c b/webcit/html2html.c index 0e6dad744..f41ac542a 100644 --- a/webcit/html2html.c +++ b/webcit/html2html.c @@ -68,7 +68,8 @@ void output_html(char *charset) { ) { ic = iconv_open("UTF-8", charset); if (ic == (iconv_t)(-1) ) { - lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno)); + lprintf(5, "%s:%d iconv_open() failed: %s\n", + __FILE__, __LINE__, strerror(errno)); } } if (ic != (iconv_t)(-1) ) { diff --git a/webcit/messages.c b/webcit/messages.c index d48c55706..a02296df5 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -599,7 +599,6 @@ void read_message(long msgnum, int printable_view, char *section) { } safestrncpy(&reply_all[strlen(reply_all)], &buf[5], (sizeof reply_all - strlen(reply_all)) ); - lprintf(9, "REPLY_ALL: %s\n", reply_all); // FIXME } if ((!strncasecmp(buf, "hnod=", 5)) && (strcasecmp(&buf[5], serv_info.serv_humannode))) { @@ -855,7 +854,8 @@ void read_message(long msgnum, int printable_view, char *section) { ) { ic = iconv_open("UTF-8", mime_charset); if (ic == (iconv_t)(-1) ) { - lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", __FILE__, __LINE__, mime_charset, strerror(errno)); + lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", + __FILE__, __LINE__, mime_charset, strerror(errno)); } } #endif @@ -1208,7 +1208,8 @@ void pullquote_message(long msgnum, int forward_attachments) { ) { ic = iconv_open("UTF-8", mime_charset); if (ic == (iconv_t)(-1) ) { - lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno)); + lprintf(5, "%s:%d iconv_open() failed: %s\n", + __FILE__, __LINE__, strerror(errno)); } } #endif @@ -2799,7 +2800,6 @@ void do_stuff_to_msgs(void) { serv_puts("MSGS ALL"); serv_getln(buf, sizeof buf); - lprintf(9, "%s:%d fetching msgnums\n", __FILE__, __LINE__); if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { ptr = malloc(sizeof(struct stuff_t)); ptr->msgnum = atol(buf); @@ -2817,10 +2817,8 @@ void do_stuff_to_msgs(void) { if (!strcasecmp(bstr(buf), "yes")) { if (delete_button_pressed) { - lprintf(9, "%s:%d move %d\n", __FILE__, __LINE__, stuff->msgnum); serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum); serv_getln(buf, sizeof buf); - lprintf(9, "%s:%d %s\n", __FILE__, __LINE__, buf); } } @@ -2829,7 +2827,6 @@ void do_stuff_to_msgs(void) { free(stuff); stuff = ptr; } - lprintf(9, "%s:%d done, moving on...\n", __FILE__, __LINE__); readloop("readfwd"); } diff --git a/webcit/rss.c b/webcit/rss.c index fe4a5d7a0..0080e866d 100644 --- a/webcit/rss.c +++ b/webcit/rss.c @@ -235,7 +235,8 @@ void display_rss(char *roomname, char *request_method) if (strcasecmp(charset, "us-ascii") && strcasecmp(charset, "utf-8") && strcasecmp(charset, "") ) { ic = iconv_open("UTF-8", charset); if (ic == (iconv_t)(-1)) { - lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno)); + lprintf(5, "%s:%d iconv_open() failed: %s\n", + __FILE__, __LINE__, strerror(errno)); goto ENDBODY; } } diff --git a/webcit/webcit.h b/webcit/webcit.h index 5e4732b99..cf126c41a 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -88,11 +88,11 @@ #define SLEEPING 180 /* TCP connection timeout */ #define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ #define PORT_NUM 2000 /* port number to listen on */ -#define SERVER "WebCit v6.30" /* who's in da house */ +#define SERVER "WebCit v6.31" /* who's in da house */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 630 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 661 /* min required Citadel vers */ +#define CLIENT_VERSION 631 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 661 /* min required Citadel ver. */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define LB (1) /* Internal escape chars */ -- 2.30.2