VACATION and REJECT messages now appear to come from

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 4282a75e40baf0af33858a130a8ad60ceca49a99..4295d7be386566e4b0e54e430a1f73beb9635dc9 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -1,14 +1,17 @@
 /* $Id$ */
 
-#define aide_message(text)      quickie_message("Citadel",NULL,AIDEROOM,text,0,NULL)
+#define aide_message(text)      quickie_message("Citadel",NULL,NULL,AIDEROOM,text,0,NULL)
 
-#define MSGS_ALL        0
-#define MSGS_OLD        1
-#define MSGS_NEW        2
-#define MSGS_FIRST      3
-#define MSGS_LAST       4
-#define MSGS_GT         5
-#define MSGS_EQ                6
+enum {
+       MSGS_ALL,
+       MSGS_OLD,
+       MSGS_NEW,
+       MSGS_FIRST,
+       MSGS_LAST,
+       MSGS_GT,
+       MSGS_EQ,
+       MSGS_SEARCH
+};
 
 /*
  * Possible return codes from CtdlOutputMsg()
@@ -35,6 +38,7 @@ struct ma_info {
                                 * digging through a subsection */
        int did_print;          /* One alternative has been displayed */
        char chosen_part[128];  /* Which part of a m/a did we choose? */
+       int chosen_pref;        /* Chosen part preference level (lower is better) */
        int use_fo_hooks;       /* Use fixed output hooks */
 };
 
@@ -90,7 +94,7 @@ void cmd_opna (char *cmdbuf);
 long send_message (struct CtdlMessage *);
 void loadtroom (void);
 long CtdlSubmitMsg(struct CtdlMessage *, struct recptypes *, char *);
-void quickie_message (char *, char *, char *, char *, int, char *);
+void quickie_message (char *, char *, char *, char *, char *, int, char *);
 void cmd_ent0 (char *entargs);
 void cmd_dele (char *delstr);
 void cmd_move (char *args);
@@ -99,12 +103,14 @@ void PutMetaData(struct MetaData *);
 void AdjRefCount(long, int);
 void simple_listing(long, void *);
 int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template);
-int CtdlForEachMessage(int mode, long ref,
+int CtdlForEachMessage(int mode,
+                       long ref,
+                       char *searchstring,
                        char *content_type,
                        struct CtdlMessage *compare,
                         void (*CallBack) (long, void *),
                        void *userdata);
-int CtdlDeleteMessages(char *, long, char *, int);
+int CtdlDeleteMessages(char *, long *, int, char *, int);
 void CtdlWriteObject(char *, char *, char *, struct ctdluser *,
                        int, int, unsigned int);
 struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body);
@@ -132,7 +138,6 @@ int CtdlOutputPreLoadedMsg(struct CtdlMessage *,
                int crlf                /* 0=LF, 1=CRLF */
 );
 int CtdlCopyMsgsToRoom(long *msgnum, int num_msgs, char *dest);
-int CtdlCopyMsgToRoom(long msgnum, char *dest);
 int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void);
 int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, size_t n);