Added WINDOW_REC declaration to common.h, removed unneeded #include "servers.h" from fe-windows.h which broke several files, added the #include in them.

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

src/common.h

@@ -91,4 +91,6 @@ typedef struct _SERVER_CONNECT_REC SERVER_CONNECT_REC;
 typedef struct _SERVER_SETUP_REC SERVER_SETUP_REC;
 typedef struct _CHANNEL_SETUP_REC CHANNEL_SETUP_REC;
 
+typedef struct _WINDOW_REC WINDOW_REC;
+
 #endif

src/core/nicklist.c

@@ -102,6 +102,7 @@ static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick)
 {
 	signal_emit("nicklist remove", 2, channel, nick);
 
+	if (g_hash_table_size(nick->module_data) > 5) g_error("BUG!"); // FIXME: debug
         MODULE_DATA_DEINIT(nick);
 	g_free(nick->nick);
 	g_free_not_null(nick->realname);

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

@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "chatnets.h"
+#include "servers.h"
 #include "servers-setup.h"
 #include "channels.h"
 #include "channels-setup.h"

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

@@ -29,6 +29,7 @@
 
 #include "chat-protocols.h"
 #include "chatnets.h"
+#include "servers.h"
 #include "channels.h"
 #include "channels-setup.h"
 #include "nicklist.h"

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

@@ -26,6 +26,7 @@
 #include "settings.h"
 #include "irssi-version.h"
 
+#include "servers.h"
 #include "channels.h"
 #include "servers-setup.h"
 

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

@@ -27,6 +27,7 @@
 #include "line-split.h"
 #include "settings.h"
 #include "irssi-version.h"
+#include "servers.h"
 
 #include "fe-windows.h"
 #include "printtext.h"

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

@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include "modules.h"
 #include "signals.h"
 #include "commands.h"
 #include "pidwait.h"

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

@@ -27,12 +27,14 @@
 #include "special-vars.h"
 #include "settings.h"
 
-#include "window-items.h"
+#include "servers.h"
-#include "fe-queries.h"
 #include "channels.h"
 #include "nicklist.h"
-#include "hilight-text.h"
 #include "ignore.h"
+
+#include "window-items.h"
+#include "fe-queries.h"
+#include "hilight-text.h"
 #include "printtext.h"
 
 #define ishighalnum(c) ((unsigned char) (c) >= 128 || isalnum(c))

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

@@ -27,6 +27,7 @@
 #include "settings.h"
 
 #include "chat-protocols.h"
+#include "servers.h"
 #include "queries.h"
 
 #include "fe-windows.h"

src/fe-common/core/fe-windows.h

@@ -1,7 +1,6 @@
 #ifndef __WINDOWS_H
 #define __WINDOWS_H
 
-#include "servers.h"
 #include "window-item-def.h"
 
 enum {
@@ -17,7 +16,7 @@ typedef struct {
 	unsigned int sticky:1;
 } WINDOW_BIND_REC;
 
-typedef struct {
+struct _WINDOW_REC {
 	int refnum;
 	char *name;
 
@@ -48,7 +47,7 @@ typedef struct {
 	void *theme; /* THEME_REC */
 
 	void *gui_data;
-} WINDOW_REC;
+};
 
 extern GSList *windows;
 extern WINDOW_REC *active_win;

src/fe-common/core/formats.c

@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "levels.h"
+#include "servers.h"
 
 #include "fe-windows.h"
 #include "window-items.h"

src/fe-common/irc/dcc/fe-dcc-chat.c

@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "irc.h"
+#include "irc-servers.h"
 #include "irc-queries.h"
 #include "dcc-chat.h"
 

src/fe-common/irc/fe-irc-channels.c

@@ -23,6 +23,7 @@
 #include "signals.h"
 #include "levels.h"
 
+#include "irc-servers.h"
 #include "irc-channels.h"
 #include "channel-rejoin.h"