From b75acf6367400ff88428618719cefbbee648b0cb Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast 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. --- protocols/nogaim.h | 1 + 1 file changed, 1 insertion(+) (limited to 'protocols') 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 */ -- cgit v1.2.3 From 4cf80bb798a4159f42a904cb830b99c87a0ca8e0 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 23 Oct 2009 11:43:15 +0100 Subject: Shuffling a few more #includes. Much more shuffling will be needed. --- protocols/jabber/jabber.h | 3 ++- protocols/nogaim.c | 4 +++- protocols/nogaim.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index ee453144..1180d2b9 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -26,8 +26,9 @@ #include -#include "xmltree.h" #include "bitlbee.h" +#include "md5.h" +#include "xmltree.h" extern GSList *jabber_connections; diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 710b7645..21f7dcb1 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -32,9 +32,11 @@ */ #define BITLBEE_CORE -#include "nogaim.h" #include +#include "nogaim.h" +#include "chat.h" + static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ); GSList *connections; diff --git a/protocols/nogaim.h b/protocols/nogaim.h index ade8c23f..dc6154e2 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -38,12 +38,12 @@ #ifndef _NOGAIM_H #define _NOGAIM_H +#include + #include "bitlbee.h" #include "account.h" #include "proxy.h" #include "query.h" -#include "md5.h" -#include "chat.h" #define BUDDY_ALIAS_MAXLEN 388 /* because MSN names can be 387 characters */ -- cgit v1.2.3