Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / imap / imap_metadata.c

diff --git a/citadel/modules/imap/imap_metadata.c b/citadel/modules/imap/imap_metadata.c
index 73a2f71a3064b64eaf670ff4ed20dacfdbd2f30a..e9ea55ee9acdc3dcbf4222045cca47562c8f2e69 100644 (file)
--- a/citadel/modules/imap/imap_metadata.c
+++ b/citadel/modules/imap/imap_metadata.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2007-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
@@ -147,7 +147,7 @@ void imap_setmetadata(int num_parms, ConstStr *Params) {
        if (IMAP->selected) {
                strcpy(savedroom, CC->room.QRname);
        }
-       CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+       CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
        /*
         * Always set the per-user view to the requested one.
@@ -187,7 +187,7 @@ void imap_setmetadata(int num_parms, ConstStr *Params) {
         * If a different folder was previously selected, return there now.
         */
        if ( (IMAP->selected) && (strcasecmp(roomname, savedroom)) ) {
-               CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+               CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
        }
        return;
 }
@@ -206,11 +206,13 @@ void imap_getmetadata(int num_parms, ConstStr *Params) {
        int ret;
        int found = 0;
 
+/* this doesn't work if you have rooms/floors with spaces. 
+   we need this for the bynari connector.
        if (num_parms > 5) {
                IReply("BAD usage error");
                return;
        }
-
+*/
        ret = imap_grabroom(roomname, Params[2].Key, 1);
        if (ret != 0) {
                IReply("NO Invalid mailbox name or access denied");
@@ -224,7 +226,7 @@ void imap_getmetadata(int num_parms, ConstStr *Params) {
        if (IMAP->selected) {
                strcpy(savedroom, CC->room.QRname);
        }
-       CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+       CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
        IAPuts("* METADATA ");
        IPutCParamStr(2);
@@ -302,7 +304,7 @@ void imap_getmetadata(int num_parms, ConstStr *Params) {
         * If a different folder was previously selected, return there now.
         */
        if ( (IMAP->selected) && (strcasecmp(roomname, savedroom)) ) {
-               CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+               CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
        }
 
        IReply("OK GETMETADATA complete");