From b75acf6367400ff88428618719cefbbee648b0cb Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 22 Oct 2009 22:55:23 +0100
Subject: Don't include chat.h from bitlbee.h. make install-dev doesn't install
 chat.h and it shouldn't ... but things broke because bitlbee.h includes it.
 Fixes #534.

---
 account.c          | 1 +
 bitlbee.h          | 1 -
 chat.c             | 1 +
 chat.h             | 5 +++++
 irc_commands.c     | 1 +
 protocols/nogaim.h | 1 +
 root_commands.c    | 1 +
 storage_xml.c      | 1 +
 8 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/account.c b/account.c
index cb54731f..912cba6a 100644
--- a/account.c
+++ b/account.c
@@ -26,6 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 #include "account.h"
+#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
 {
diff --git a/bitlbee.h b/bitlbee.h
index cbda42cd..46a91419 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -128,7 +128,6 @@
 #include "commands.h"
 #include "account.h"
 #include "nick.h"
-#include "chat.h"
 #include "conf.h"
 #include "log.h"
 #include "ini.h"
diff --git a/chat.c b/chat.c
index 87c262b8..8c5ce0bc 100644
--- a/chat.c
+++ b/chat.c
@@ -24,6 +24,7 @@
 */
 
 #include "bitlbee.h"
+#include "chat.h"
 
 struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )
 {
diff --git a/chat.h b/chat.h
index 5aef745c..7196aea8 100644
--- a/chat.h
+++ b/chat.h
@@ -23,6 +23,9 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifndef _CHAT_H
+#define _CHAT_H
+
 struct chat
 {
 	account_t *acc;
@@ -44,3 +47,5 @@ int chat_chancmp( char *a, char *b );
 int chat_chanok( char *a );
 
 int chat_join( irc_t *irc, struct chat *c, const char *password );
+
+#endif
diff --git a/irc_commands.c b/irc_commands.c
index 044ff62c..74334ee9 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -26,6 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 #include "ipc.h"
+#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 1e5df503..ade8c23f 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -43,6 +43,7 @@
 #include "proxy.h"
 #include "query.h"
 #include "md5.h"
+#include "chat.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
diff --git a/root_commands.c b/root_commands.c
index 678ee143..5de616fb 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -28,6 +28,7 @@
 #include "crypting.h"
 #include "bitlbee.h"
 #include "help.h"
+#include "chat.h"
 
 #include <string.h>
 
diff --git a/storage_xml.c b/storage_xml.c
index b78c3661..b6745c75 100644
--- a/storage_xml.c
+++ b/storage_xml.c
@@ -28,6 +28,7 @@
 #include "base64.h"
 #include "arc.h"
 #include "md5.h"
+#include "chat.h"
 
 #if GLIB_CHECK_VERSION(2,8,0)
 #include <glib/gstdio.h>
-- 
cgit v1.2.3