From e6b64077caa2a562df1661d165d5c3db43323541 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 12 Aug 2005 01:01:27 +0000
Subject: [PATCH] * 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).

---
 webcit/ChangeLog | 8 ++++++++
 webcit/iconbar.c | 8 ++++----
 webcit/summary.c | 8 ++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 65eab3428..a31b8e6f6 100644
--- 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 8f9dc0cc1..f9ffe1598 100644
--- 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 a9cddadf9..8d32297e5 100644
--- 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&nbsp;on&nbsp;your&nbsp;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 {
-- 
2.39.2