* Updated the output of server GOTO command; new parameter indicates whether

  the user is in his Trash folder.
* Updated internal version number to 6.63 so WebCit knows this is available.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 377fcc5be46634ce5cb18ad7b02e3794be55777c..5d7281f4124c0458b5a9d011fafac251dc62f602 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,10 @@
 $Id$
 
+Fri Dec  9 14:14:37 EST 2005 ajc
+* Updated the output of server GOTO command; new parameter indicates whether
+  the user is in his Trash folder.
+* Updated internal version number to 6.63 so WebCit knows this is available.
+
 Mon Nov 28 10:45:21 EST 2005 ajc
 * control.c: fixed a potential concurrency/race condition in
   the get_new_[message|room|user]_number() functions.

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f18b28f30201c27916402318afbbe6a095fca606..db1ff716725f7aa148036de2c98643aabf2cc17f 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -33,7 +33,7 @@ extern "C" {
 /*
  * Text description of this software
  */
-#define CITADEL        "Citadel 6.62"
+#define CITADEL        "Citadel 6.63"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      662             /* This version */
+#define REV_LEVEL      663             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 655             /* Oldest compatible export files */
 

diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index 2273ea68024e94c98de8f027a59cceaf5d77be91..7b9b60813ac1e88f6e27dd8c0f8c4a4a0de7233b 100644 (file)
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "6.62"
+!define MUI_VERSION "6.63"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE
@@ -18,7 +18,7 @@
 ;!define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
 
-OutFile "citadel-6.62.exe"
+OutFile "citadel-6.63.exe"
 BGGradient off
 
 LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)"

diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 04f004745011c98e5aed9bbd83493f4f25053c21..0d9ff934cce05294313e363ea089477fe22f2d9f 100644 (file)
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,7 +1,7 @@
 # $Id$
 Summary: Citadel, the flexible, powerful way to build online communities
 Name: citadel
-Version: 6.62
+Version: 6.63
 Release: 1
 Copyright: GPL
 Group: Applications/Communications

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 35adabbc383791c13b9d32996d25e4c07d6fb10a..e268ed0c72ebbcabb6ef8554ef3df82a1238ac6c 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -778,6 +778,7 @@ void usergoto(char *where, int display_result, int transiently,
        int s;
        char setstr[128], lostr[64], histr[64];
        long lo, hi;
+       int is_trash = 0;
 
        /* If the supplied room name is NULL, the caller wants us to know that
         * it has already copied the room record into CC->room, so
@@ -876,6 +877,10 @@ void usergoto(char *where, int display_result, int transiently,
                safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname);
        }
 
+       if (!strcasecmp(truncated_roomname, USERTRASHROOM)) {
+               is_trash = 1;
+       }
+
        if (retmsgs != NULL) *retmsgs = total_messages;
        if (retnew != NULL) *retnew = new_messages;
        lprintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n",
@@ -886,7 +891,7 @@ void usergoto(char *where, int display_result, int transiently,
        CC->curr_view = (int)vbuf.v_view;
 
        if (display_result) {
-               cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|\n",
+               cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|\n",
                        CIT_OK, CtdlCheckExpress(),
                        truncated_roomname,
                        (int)new_messages,
@@ -900,7 +905,8 @@ void usergoto(char *where, int display_result, int transiently,
                        (int)newmailcount,
                        (int)CC->room.QRfloor,
                        (int)vbuf.v_view,
-                       (int)CC->room.QRdefaultview
+                       (int)CC->room.QRdefaultview,
+                       (int)is_trash
                );
        }
 }

diff --git a/citadel/techdoc/protocol.txt b/citadel/techdoc/protocol.txt
index f2fd17d08483957567d273faafa136f2e73192cd..fdc1882e2959365f40d6f8717984f48c66c989a1 100644 (file)
--- a/citadel/techdoc/protocol.txt
+++ b/citadel/techdoc/protocol.txt
@@ -453,6 +453,7 @@ user to the arrival of new mail during a session)
   10. The floor number this room resides on
   11. The *current* "view" for this room (see views.txt for more info)
   12. The *default* "view" for this room
+  13. Boolian flag: 1 if this is the user's Trash folder, 0 otherwise.
  
  The default view gives the client a hint as to what views the user should
 be allowed to select.  For example, it would be confusing to allow messages