* we have now several bstrs:

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index c05bce888b8d9c78e5b93d6b0088516cf70326ce..25c1b9e2e431dd314cedb47f94f40939de99062f 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -1,11 +1,9 @@
 /*
  * $Id$
+ *
+ * Displays and customizes the iconbar.
  */
-/**
- * \defgroup IconBar Displays and customizes the iconbar.
- * \ingroup MenuInfrastructure
- */
-/*@{*/
+
 #include "webcit.h"
 
 
@@ -602,7 +600,6 @@ void display_customize_iconbar(void) {
                _("Your personal notes")
        );
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        bar = 1 - bar;
        wprintf("<tr class=\"%s\"><td>"
                "<input type=\"radio\" name=\"ib_calendar\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
@@ -636,7 +633,6 @@ void display_customize_iconbar(void) {
                _("Tasks"),
                _("A shortcut to your personal task list")
        );
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
        bar = 1 - bar;
        wprintf("<tr class=\"%s\"><td>"
@@ -768,19 +764,19 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                display_main_menu();
                return;
        }
 
-       sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas")));
+       sprintf(iconbar, "ib_displayas=%d", ibstr("ib_displayas"));
 
        for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
                char *Val;
-               if (!strcasecmp(bstr(boxen[i]), "yes")) {
+               if (!strcasecmp(BSTR(boxen[i]), "yes")) {
                        Val = "1";
                }
-               else if (!strcasecmp(bstr(boxen[i]), "yeslist")) {
+               else if (!strcasecmp(BSTR(boxen[i]), "yeslist")) {
                        Val = "2";
                }
                else {