* The iconbar and summary screen now connect to the user's primary

  groupware rooms using the new macros: _CALENDAR_, _TASKS_, _NOTES_,
  and _CONTACTS_, in order to facilitate those rooms potentially having
  different names on some hosts (such as, perhaps, the same names but in
  different languages).

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 65eab34282b2ba62b00bb4853237351c62bece84..a31b8e6f6f46545af3dc84e2fad24c0ff78bcc3a 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,11 @@
 $Log$
+Revision 621.4  2005/08/12 01:01:27  ajc
+* The iconbar and summary screen now connect to the user's primary
+  groupware rooms using the new macros: _CALENDAR_, _TASKS_, _NOTES_,
+  and _CONTACTS_, in order to facilitate those rooms potentially having
+  different names on some hosts (such as, perhaps, the same names but in
+  different languages).
+
 Revision 621.3  2005/08/11 23:15:03  ajc
 * Added debian build directory (submitted by W. Goesgens)
 
@@ -2795,3 +2802,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 8f9dc0cc1c9fc9cedebdd66aaa1be71aeba89517..f9ffe1598d1c8a0d9926aae3b8d5421bca228aad 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -137,7 +137,7 @@ void do_iconbar(void) {
 
        if (ib_calendar) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Calendar\" "
+                       "<A HREF=\"/dotgoto?room=_CALENDAR_\" "
                        "TITLE=\"Go to your personal calendar\" "
                        ">"
                );
@@ -153,7 +153,7 @@ void do_iconbar(void) {
 
        if (ib_contacts) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Contacts\" "
+                       "<A HREF=\"/dotgoto?room=_CONTACTS_\" "
                        "TITLE=\"Go to your personal address book\" "
                        ">"
                );
@@ -169,7 +169,7 @@ void do_iconbar(void) {
 
        if (ib_notes) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "<A HREF=\"/dotgoto?room=_NOTES_\" "
                        "TITLE=\"Go to your personal notes\" "
                        ">"
                );
@@ -185,7 +185,7 @@ void do_iconbar(void) {
 
        if (ib_tasks)  {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Tasks\" "
+                       "<A HREF=\"/dotgoto?room=_TASKS_\" "
                        "TITLE=\"Go to your personal task list\" "
                        ">"
                );

diff --git a/webcit/summary.c b/webcit/summary.c
index a9cddadf9b35dbf56a7fb794ac9eae06d46c8c96..8d32297e51a57d0b32401ff28f70d4d8c3239ebe 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -139,8 +139,8 @@ void tasks_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Tasks");
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       gotoroom("Tasks");
-       if (strcasecmp(WC->wc_roomname, "Tasks")) {
+       gotoroom("_TASKS_");
+       if (WC->wc_view != VIEW_TASKS) {
                num_msgs = 0;
        }
        else {
@@ -177,8 +177,8 @@ void calendar_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Today on your calendar");
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       gotoroom("Calendar");
-       if (strcasecmp(WC->wc_roomname, "Calendar")) {
+       gotoroom("_CALENDAR_");
+       if (WC->wc_view != VIEW_CALENDAR) {
                num_msgs = 0;
        }
        else {