*** empty log message ***

[citadel.git] / citadel / imap_misc.c

diff --git a/citadel/imap_misc.c b/citadel/imap_misc.c
index ab03090b1a068f7d119ef56db28412c87cb4fffd..2dbb473f7fd184b5b817f8ab8c3f772fabd3f54d 100644 (file)
--- a/citadel/imap_misc.c
+++ b/citadel/imap_misc.c
@@ -68,7 +68,7 @@ int imap_do_copy(char *destination_folder) {
 
        if (IMAP->num_msgs > 0) {
                for (i = 0; i < IMAP->num_msgs; ++i) {
-                       if (IMAP->flags[i] && IMAP_SELECTED) {
+                       if (IMAP->flags[i] & IMAP_SELECTED) {
                                CtdlCopyMsgToRoom(
                                        IMAP->msgids[i], roomname);
                        }
@@ -281,7 +281,7 @@ void imap_append(int num_parms, char *parms[]) {
         * folder is selected, save its name so we can return there!!!!!)
         */
        if (IMAP->selected) {
-               strcpy(savedroom, CC->quickroom.QRname);
+               strcpy(savedroom, CC->room.QRname);
        }
        usergoto(roomname, 0, 0, &msgs, &new);
 
@@ -293,11 +293,11 @@ void imap_append(int num_parms, char *parms[]) {
         * private mailboxes.
          */
         if (CC->logged_in) {
-          if ( (CC->quickroom.QRflags & QR_MAILBOX) == 0) {
+          if ( (CC->room.QRflags & QR_MAILBOX) == 0) {
                 if (msg->cm_fields['A'] != NULL) phree(msg->cm_fields['A']);
                 if (msg->cm_fields['N'] != NULL) phree(msg->cm_fields['N']);
                 if (msg->cm_fields['H'] != NULL) phree(msg->cm_fields['H']);
-                msg->cm_fields['A'] = strdoop(CC->usersupp.fullname);
+                msg->cm_fields['A'] = strdoop(CC->user.fullname);
                 msg->cm_fields['N'] = strdoop(config.c_nodename);
                 msg->cm_fields['H'] = strdoop(config.c_humannode);
            }