libical, expat, and libsieve are now *required*.

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index d47d6a830f572e14be365b743a78f93ad7fc25f2..2265e9bd7f8708617fce291af7c25e3819a4d1e3 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -124,9 +124,9 @@ extern locale_t wc_locales[];
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         730             /* This version of WebCit */
+#define CLIENT_VERSION         734             /* This version of WebCit */
 #define MINIMUM_CIT_VERSION    730             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          106             /* min required libcitadel ver */
+#define        LIBCITADEL_MIN          109             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
@@ -387,8 +387,6 @@ struct wcsession {
        char this_page[512];                    /**< URL of current page */
        char http_host[512];                    /**< HTTP Host: header */
        HashList *hash_prefs;                   /**< WebCit preferences for this user */
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE            
-       /** \brief ical???? */                          
        struct disp_cal {                                       
                icalcomponent *cal;             /**< cal items for display */
                long cal_msgnum;                /**< cal msgids for display */
@@ -396,7 +394,6 @@ struct wcsession {
                int unread;                     /**< already seen by the user? */
        } *disp_cal;                                            
        int num_cal;                            /**< number of calendar items for display */
-#endif                                                                                 
        struct wc_attachment *first_attachment; /**< linked list of attachments for 'enter message' */
        char last_chat_user[256];               /**< ??? todo */
        char ImportantMessage[SIZ];             /**< ??? todo */
@@ -490,7 +487,7 @@ void ungoto(void);
 void get_serv_info(char *, char *);
 int uds_connectsock(char *);
 int tcp_connectsock(char *, char *);
-void serv_getln(char *strbuf, int bufsize);
+int serv_getln(char *strbuf, int bufsize);
 void serv_puts(char *string);
 void who(void);
 void who_inner_div(void);
@@ -638,7 +635,6 @@ void get_preference(char *key, char *value, size_t value_len);
 void set_preference(char *key, char *value, int save_to_server);
 void knrooms(void);
 int is_msg_in_mset(char *mset, long msgnum);
-char *safestrncpy(char *dest, const char *src, size_t n);
 void display_addressbook(long msgnum, char alpha);
 void offer_start_page(void);
 void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext);
@@ -698,7 +694,6 @@ void display_pictureview(void);
 void download_file(char *);
 void upload_file(void);
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
 void display_edit_task(void);
 void save_task(void);
 void display_edit_event(void);
@@ -721,7 +716,6 @@ int ical_ctdl_is_overlap(
                         struct icaltimetype t2start,
                         struct icaltimetype t2end
 );
-#endif
 
 #ifdef ENABLE_NLS
 void initialize_locales(void);
@@ -761,6 +755,7 @@ int get_time_format_cached (void);
 int xtoi(char *in, size_t len);
 void webcit_fmt_date(char *buf, time_t thetime, int brief);
 
+
 #ifdef HAVE_ICONV
 iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode);
 #endif
@@ -790,9 +785,7 @@ int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen,
                           const Bytef * source, uLong sourceLen, int level);
 #endif
 
-#ifdef HAVE_ICONV
 void utf8ify_rfc822_string(char *buf);
-#endif
 
 void begin_burst(void);
 void end_burst(void);