Readloop remove special cases

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index 63fce7f0476db7c840f6509e78343ba9ef776c6f..d9d0ebf65b4867dcf869f529bd618e241c2fc021 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -1,6 +1,6 @@
 
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 #include "webserver.h"
 
 int pastel_palette[9][3] = {
@@ -30,7 +30,6 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
        char mime_filename[256];
        char mime_content_type[256];
        char mime_disposition[256];
-       int mime_length;
        char relevant_partnum[256];
        int phase = 0;                          /* 0 = citadel headers, 1 = mime headers, 2 = body */
        char msg4_content_type[256] = "";
@@ -64,7 +63,6 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                                extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum);
                                extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition);
                                extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type);
-                               mime_length = extract_int(&bptr[5], 5);
 
                                if (!strcasecmp(mime_content_type, "text/vnote")) {
                                        strcpy(relevant_partnum, mime_partnum);
@@ -292,7 +290,7 @@ void ajax_update_note(void) {
  *
  * msgnum = Message number on the local server of the note to be displayed
  */
-////TODO: falscher hook
+/*TODO: wrong hook */
 int notes_LoadMsgFromServer(SharedMessageStatus *Stat, 
                            void **ViewSpecific, 
                            message_summary* Msg, 
@@ -402,7 +400,7 @@ void tmpl_vcard_put_bgcolor(StrBuf *Target, WCTemplputParams *TP)
 void tmpl_vcard_put_message(StrBuf *Target, WCTemplputParams *TP)
 {
        struct vnote *v = (struct vnote *) CTX;
-       StrEscAppend(Target, NULL, v->body, 0, 0); ///TODO?
+       StrEscAppend(Target, NULL, v->body, 0, 0); /*TODO?*/
 }
 
 void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP)
@@ -418,7 +416,9 @@ int notes_GetParamsGetServerCall(SharedMessageStatus *Stat,
                                 void **ViewSpecific, 
                                 long oper, 
                                 char *cmd, 
-                                long len)
+                                long len,
+                                char *filter,
+                                long flen)
 {
        strcpy(cmd, "MSGS ALL");
        Stat->maxmsgs = 32767;
@@ -443,6 +443,7 @@ InitModule_NOTES
                notes_GetParamsGetServerCall,
                NULL,
                NULL,
+               NULL,
                notes_LoadMsgFromServer,
                NULL,
                notes_Cleanup);