Some changes to view vs. default view behavior.

This is to support the new Calendar List view without destroying the server behavior
for Calendar rooms.

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 8d1dff6016b00a7b62a28e2d878cfa30c465f810..39c68d820db6ddce748732989949c6934a2637dc 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -1751,8 +1751,8 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
        struct icalmessagemod imm;
 
        /* First determine if this is a calendar or tasks room */
-       if ( (CC->curr_view != VIEW_CALENDAR)
-          &&(CC->curr_view != VIEW_TASKS) ) {
+       if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
+          &&(CC->room.QRdefaultview != VIEW_TASKS) ) {
                return(0);              /* Not a vCalendar-centric room */
        }
 

diff --git a/citadel/serv_notes.c b/citadel/serv_notes.c
index 15c694874e43cfba62cb38f49237e757e88a33b9..be07912d80b58f8a27b3b3b934ce4751c507c684 100644 (file)
--- a/citadel/serv_notes.c
+++ b/citadel/serv_notes.c
@@ -59,7 +59,7 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
 
        /* First determine if this room has the "notes" view set */
 
-       if (CC->curr_view != VIEW_NOTES) {
+       if (CC->room.QRdefaultview != VIEW_NOTES) {
                return(0);                      /* not notes; do nothing */
        }
 

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 23c69648c3dffe9f6793c9996c631879d132b555..988070d74fcba74e31f9723c11cc258bfb71a04b 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -263,7 +263,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        }
 
        /* Is this a room with an address book in it? */
-       if (CC->curr_view == VIEW_ADDRESSBOOK) {
+       if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
                yes_any_vcard_room = 1;
        }