Lots of moving stuff around - hopefully I didn't break too much :)

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@632 dbcabf3a-b0e7-0310-adc4-f8d773084564

src/fe-common/core/Makefile.am

@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libfe_common_core.la
+noinst_LIBRARIES = libfe_common_core.a
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
@@ -6,7 +6,7 @@ INCLUDES = \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
-libfe_common_core_la_SOURCES = \
+libfe_common_core_a_SOURCES = \
 	autorun.c \
 	command-history.c \
 	completion.c \

src/fe-common/core/fe-common-core.c

@@ -133,6 +133,8 @@ void fe_common_core_finish_init(void)
 {
 	WINDOW_REC *window;
 
+	signal_emit("irssi init read settings", 0);
+
 	signal(SIGPIPE, SIG_IGN);
 
 	windows_restore();

src/fe-common/core/fe-log.c

@@ -22,7 +22,7 @@
 #include "module-formats.h"
 #include "signals.h"
 #include "commands.h"
-#include "server.h"
+#include "servers.h"
 #include "levels.h"
 #include "misc.h"
 #include "log.h"

src/fe-common/core/fe-server.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
 #include "signals.h"
-#include "settings.h"
 #include "network.h"
-
 #include "levels.h"
-#include "server.h"
+#include "servers.h"
+#include "settings.h"
+
+#include "module-formats.h"
 
 static void sig_server_looking(SERVER_REC *server)
 {

src/fe-common/core/fe-settings.c

@@ -22,7 +22,7 @@
 #include "module-formats.h"
 #include "signals.h"
 #include "commands.h"
-#include "server.h"
+#include "servers.h"
 #include "misc.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"

src/fe-common/core/hilight-text.c

@@ -27,7 +27,7 @@
 #include "settings.h"
 
 #include "levels.h"
-#include "server.h"
+#include "servers.h"
 
 #include "hilight-text.h"
 

src/fe-common/core/printtext.c

@@ -27,7 +27,7 @@
 #include "settings.h"
 
 #include "levels.h"
-#include "server.h"
+#include "servers.h"
 
 #include "translation.h"
 #include "themes.h"

src/fe-common/core/window-activity.c

@@ -21,7 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "levels.h"
-#include "server.h"
+#include "servers.h"
 #include "misc.h"
 #include "settings.h"
 

src/fe-common/core/window-commands.c

@@ -23,7 +23,7 @@
 #include "signals.h"
 #include "commands.h"
 #include "misc.h"
-#include "server.h"
+#include "servers.h"
 
 #include "levels.h"
 
@@ -183,7 +183,7 @@ static void cmd_window_server(const char *data)
 	else if (active_win->active == NULL) {
 		window_change_server(active_win, server);
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_SERVER_CHANGED, server->tag, server->connrec->address,
-			    server->connrec->ircnet == NULL ? "" : server->connrec->ircnet);
+			    server->connrec->chatnet == NULL ? "" : server->connrec->chatnet);
 	}
 }
 

src/fe-common/core/window-items.c

@@ -22,7 +22,7 @@
 #include "module-formats.h"
 #include "modules.h"
 #include "signals.h"
-#include "server.h"
+#include "servers.h"
 #include "settings.h"
 
 #include "levels.h"

src/fe-common/core/window-save.c

@@ -21,7 +21,7 @@
 #include "module.h"
 #include "signals.h"
 #include "misc.h"
-#include "server.h"
+#include "servers.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
 

src/fe-common/core/windows.c

@@ -23,7 +23,7 @@
 #include "modules.h"
 #include "signals.h"
 #include "commands.h"
-#include "server.h"
+#include "servers.h"
 #include "misc.h"
 #include "settings.h"
 

src/fe-common/core/windows.h

@@ -1,6 +1,11 @@
 #ifndef __WINDOWS_H
 #define __WINDOWS_H
 
+#include "servers.h"
+
+#define STRUCT_SERVER_REC SERVER_REC
+#include "window-item-def.h"
+
 enum {
 	NEWDATA_TEXT = 1,
 	NEWDATA_MSG,
@@ -8,30 +13,13 @@ enum {
 	NEWDATA_CUSTOM
 };
 
-/* All window items *MUST* have these variables in same order
-   at the start of the structure - the server's type can of course be
-   replaced with the preferred record type.
-
-   !!!! So IF YOU CHANGE THIS: REMEMBER TO UPDATE WI_IRC_REC, CHANNEL_REC
-   and QUERY_REC !!!! (I already forgot this once :) */
-typedef struct {
-	int type;
-        GHashTable *module_data;
-
-	void *server;
-	char *name;
-
-	int new_data;
-	int last_color; /* if NEWDATA_HILIGHT is set, color number could be specified here */
-} WI_ITEM_REC;
-
 typedef struct {
 	int refnum;
 	char *name;
 
 	GSList *items;
 	WI_ITEM_REC *active;
-	void *active_server;
+	SERVER_REC *active_server;
 
 	GSList *waiting_channels; /* list of "<server tag> <channel>" */