X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ficonbar.c;h=e1ea9b0ec6cd3907d25f4031d314d6d639abe0a0;hb=HEAD;hp=53dead7a2bbe9d5b2d796a082f83a64fb60a6171;hpb=ec636368885b210420016b3f544edcbab9189880;p=citadel.git

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 53dead7a2..e1ea9b0ec 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -5,17 +5,11 @@
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
- * 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
 #include "webcit.h"
@@ -221,11 +215,12 @@ void tmplput_iconbar(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;
 	
-	 if (	(WCC != NULL)
-		&& (	(WCC->logged_in)
-			|| (WCC->serv_info->serv_supports_guest)
-		)
-	) {
+	 if ( (WCC != NULL)     &&
+	      ((WCC->logged_in) ||
+	      ((WCC->serv_info != NULL) &&
+	       (WCC->serv_info->serv_supports_guest))
+		      ) )
+	 {
 		DoTemplate(HKEY("iconbar"), NULL, &NoCtx);
 	}
 }
@@ -320,10 +315,10 @@ InitModule_ICONBAR
 	WebcitAddUrlHandler(HKEY("commit_iconbar"), "", 0, commit_iconbar, 0);
 	WebcitAddUrlHandler(HKEY("toggle_wholist_expanded_state"), "", 0, toggle_wholist_expanded_state, AJAX);
 	WebcitAddUrlHandler(HKEY("toggle_roomlist_expanded_state"), "", 0, toggle_roomlist_expanded_state, AJAX);
-	RegisterConditional(HKEY("COND:ICONBAR:ACTIVE"), 3, ConditionalIsActiveStylesheet, CTX_NONE);
+	RegisterConditional("COND:ICONBAR:ACTIVE", 3, ConditionalIsActiveStylesheet, CTX_NONE);
 	RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:ICONBAR:WHOLISTEXPANDED"), 0, ConditionalWholistExpanded, CTX_NONE);
-	RegisterConditional(HKEY("COND:ICONBAR:ROOMLISTEXPANDED"), 0, ConditionalRoomlistExpanded, CTX_NONE);
+	RegisterConditional("COND:ICONBAR:WHOLISTEXPANDED", 0, ConditionalWholistExpanded, CTX_NONE);
+	RegisterConditional("COND:ICONBAR:ROOMLISTEXPANDED", 0, ConditionalRoomlistExpanded, CTX_NONE);
 
 	RegisterPreference("iconbar", _("Iconbar Setting"), PRF_STRING, LoadIconSettings);
 	l = 1;