SUBST: Dynamicaly generate contexts

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 7a6e39d1ac477d9da041872a5892a931e79d52a6..510fbca84c048b23b96f1a68124faf341d255c5b 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -1,21 +1,15 @@
 /*
  * Displays and customizes the iconbar.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #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);
        }
 }