* merge from dav_rework:

[citadel.git] / webcit / roomops.h

diff --git a/webcit/roomops.h b/webcit/roomops.h
index 8cdf095e041ff42486fa510f61a178401229640f..726dcc3d2363bccf477671e8e546fc19fabebc9e 100644 (file)
--- a/webcit/roomops.h
+++ b/webcit/roomops.h
@@ -33,7 +33,7 @@ typedef struct _floor {
        StrBuf *Name;
        long NRooms;
        long AlphaN;
-} floor;
+} Floor;
 
 /**
  * \brief  Data structure for roomlist-to-folderlist conversion 
@@ -73,7 +73,7 @@ typedef struct _folder {
        long nRoomNameParts;
        StrBuf **RoomNameParts;
 
-       const floor *Floor;   /* pint to the floor we're on.. */
+       const Floor *Floor;   /* pint to the floor we're on.. */
 
        int hasnewmsgs; /* are there unread messages inside */
        int is_inbox;   /* is it a mailbox?  */
@@ -99,3 +99,11 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);
 void vDeleteFolder(void *vFolder);
 void FlushFolder(folder *room);
 void ParseGoto(folder *proom, StrBuf *Line);
+
+#define REST_TOPLEVEL 0
+#define REST_IN_NAMESPACE (1<<0)
+#define REST_IN_FLOOR (1<<1)
+#define REST_IN_ROOM (1<<2)
+#define REST_GOT_EUID (1<<3)
+#define REST_GOT_ID (1<<4)
+#define REST_GOT_FILENAME (1<<5)