* typedef wcsession, so we don't always need to say gcc again its a struct.

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 3469bc08beb50477ac4072796ad9a10a6d2805e7..271d0d6bac0fe139ff305cab229b79ef25952096 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -16,8 +16,8 @@
 void do_iconbar(void);
 void do_iconbar_roomlist(void);
 
-/**
- * \brief draw the icon bar?????
+/*
+ * Render the left side iconbar
  */
 void do_selected_iconbar(void) {
        if (WC->current_iconbar == current_iconbar_roomlist) {
@@ -53,7 +53,7 @@ inline const char *PrintInt(void *Prefstr)
 
 void LoadIconSettings(void)
 {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        StrBuf *iconbar = NULL;
        StrBuf *buf = NewStrBuf();;
        StrBuf *key = NewStrBuf();
@@ -321,7 +321,7 @@ void do_iconbar(void) {
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<li>"
-                       "<a href=\"display_aide_menu\" "
+                       "<a href=\"do_template?template=display_aide_menu\" "
                        "title=\"%s\" "
                        ">",
                        _("Room and system administration functions")
@@ -803,9 +803,9 @@ void commit_iconbar(void) {
 }
 
 
-void tmplput_iconbar(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+void tmplput_iconbar(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        
        if ((WCC != NULL) && (WCC->logged_in)) {
                wprintf("<div id=\"iconbar\">");
@@ -824,7 +824,7 @@ InitModule_ICONBAR
        WebcitAddUrlHandler(HKEY("iconbar_ajax_rooms"), do_iconbar_roomlist, AJAX);
        WebcitAddUrlHandler(HKEY("display_customize_iconbar"), display_customize_iconbar, 0);
        WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0);
-       RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar);
+       RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, 0);
 
 }