X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=725606d74c94805cd6808467be5cf700b1172ba3;hb=f5c1330914acc193f96892efc191a32ee537dfb5;hp=730739485da1e416b0b9ba56465dcd1707be212e;hpb=ff76a556a7974e6bc13e639905186c25b00589ec;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 730739485..725606d74 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Copyright (c) 1987-2010 by the citadel.org team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,10 +38,11 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/un.h>
 #include <netdb.h>
+#include <sys/un.h>
 #include <sys/poll.h>
 #include <string.h>
 #include <pwd.h>
@@ -53,10 +53,6 @@
 #include <sys/utsname.h>
 #include <libcitadel.h>
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
@@ -497,7 +493,6 @@ struct wcsession {
 	StrBuf *HBuf;                           /* Our HeaderBuffer */
 	StrBuf *WFBuf;                          /* Wildfire error logging buffer */
 
-	HashList *vars; 			/* HTTP variable substitutions for this page */
 	StrBuf *trailing_javascript;		/* extra javascript to be appended to page */
 	char ImportantMessage[SIZ];
 	StrBuf *ImportantMsg;
@@ -556,10 +551,8 @@ struct wcsession {
 	char last_chat_user[256];
 
 /* Iconbar controls */
-	struct __ofolder *cache_fold;		/* cache the iconbar room list */
 	int cache_max_folders;
 	int cache_num_floors;
-	time_t cache_timestamp;
 	long *IBSettingsVec;                    /* which icons should be shown / not shown? */
 	const StrBuf *floordiv_expanded;	/* which floordiv currently expanded */
 
@@ -649,7 +642,7 @@ void CreateMimeStr(void);
 int GetConnected(void);
 void DeleteServInfo(ServInfo **FreeMe);
 int uds_connectsock(char *);
-int tcp_connectsock(char *, int);
+int tcp_connectsock(char *, char *);
 int serv_getln(char *strbuf, int bufsize);
 int StrBuf_ServGetln(StrBuf *buf);
 int GetServerStatus(StrBuf *Line, long* FullState);
@@ -774,7 +767,6 @@ void CtdlMakeTempFileName(char *, int);
 void address_book_popup(void);
 void begin_ajax_response(void);
 void end_ajax_response(void);
-void burn_folder_cache(time_t age);
 
 void display_edit_task(void);
 void display_edit_event(void);
@@ -827,11 +819,6 @@ void summary(void);
 
 int is_mobile_ua(char *user_agent);
 
-void embed_room_banner(void);
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP);
-int SortRoomsByListOrder(const void *room1, const void *room2);
-
 /* actual supported locales */
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP);
 void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType);