/soc/2015/jgeboski/facebook: a1a5f0ac39f2: facebook: cleaned up ...

[James Geboski]

Changeset: a1a5f0ac39f2166a47a647928c1c8785297c1cdd
Author:	 James Geboski <jgeboski at gmail.com>
Date:	 2015-08-01 00:11 -0400
Branch:	 facebook
URL: https://hg.pidgin.im/soc/2015/jgeboski/facebook/rev/a1a5f0ac39f2

Description:

facebook: cleaned up libpurple includes

diffstat:

 libpurple/protocols/facebook/api.h      |   4 +++-
 libpurple/protocols/facebook/data.c     |   4 +++-
 libpurple/protocols/facebook/data.h     |   4 ++++
 libpurple/protocols/facebook/facebook.c |  19 ++++++++++++++++++-
 libpurple/protocols/facebook/facebook.h |   2 --
 libpurple/protocols/facebook/mqtt.c     |   1 +
 libpurple/protocols/facebook/mqtt.h     |   2 ++
 libpurple/protocols/facebook/util.c     |   3 +++
 libpurple/protocols/facebook/util.h     |   5 +++++
 9 files changed, 39 insertions(+), 5 deletions(-)

diffs (151 lines):

diff --git a/libpurple/protocols/facebook/api.h b/libpurple/protocols/facebook/api.h
--- a/libpurple/protocols/facebook/api.h
+++ b/libpurple/protocols/facebook/api.h
@@ -22,9 +22,11 @@
 #ifndef _FACEBOOK_API_H_
 #define _FACEBOOK_API_H_
 
+#include "internal.h"
+
 #include <glib.h>
 
-#include "internal.h"
+#include "connection.h"
 
 #include "http.h"
 #include "id.h"
diff --git a/libpurple/protocols/facebook/data.c b/libpurple/protocols/facebook/data.c
--- a/libpurple/protocols/facebook/data.c
+++ b/libpurple/protocols/facebook/data.c
@@ -21,9 +21,11 @@
 
 #include <string.h>
 
+#include "account.h"
+#include "glibcompat.h"
+
 #include "api.h"
 #include "data.h"
-#include "glibcompat.h"
 
 struct _FbDataPrivate
 {
diff --git a/libpurple/protocols/facebook/data.h b/libpurple/protocols/facebook/data.h
--- a/libpurple/protocols/facebook/data.h
+++ b/libpurple/protocols/facebook/data.h
@@ -24,7 +24,11 @@
 
 #include <glib.h>
 
+#include "blistnodetypes.h"
 #include "connection.h"
+#include "roomlist.h"
+
+#include "http.h"
 
 #define FB_DATA_ICON_MAX 4
 
diff --git a/libpurple/protocols/facebook/facebook.c b/libpurple/protocols/facebook/facebook.c
--- a/libpurple/protocols/facebook/facebook.c
+++ b/libpurple/protocols/facebook/facebook.c
@@ -22,18 +22,35 @@
 #include "internal.h"
 
 #include "account.h"
+#include "accountopt.h"
+#include "blistnode.h"
+#include "blistnodetypes.h"
+#include "buddyicon.h"
+#include "buddylist.h"
+#include "cmds.h"
 #include "connection.h"
+#include "conversation.h"
+#include "conversations.h"
+#include "conversationtypes.h"
 #include "glibcompat.h"
+#include "message.h"
+#include "notify.h"
 #include "plugins.h"
+#include "presence.h"
 #include "protocol.h"
 #include "protocols.h"
+#include "request.h"
 #include "roomlist.h"
+#include "server.h"
+#include "sslconn.h"
+#include "status.h"
+#include "util.h"
 #include "version.h"
 
 #include "api.h"
-#include "cmds.h"
 #include "data.h"
 #include "facebook.h"
+#include "http.h"
 #include "util.h"
 
 static GSList *fb_cmds = NULL;
diff --git a/libpurple/protocols/facebook/facebook.h b/libpurple/protocols/facebook/facebook.h
--- a/libpurple/protocols/facebook/facebook.h
+++ b/libpurple/protocols/facebook/facebook.h
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 
-#include "protocol.h"
-
 #define FACEBOOK_TYPE_PROTOCOL             (facebook_protocol_get_type())
 #define FACEBOOK_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol))
 #define FACEBOOK_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass))
diff --git a/libpurple/protocols/facebook/mqtt.c b/libpurple/protocols/facebook/mqtt.c
--- a/libpurple/protocols/facebook/mqtt.c
+++ b/libpurple/protocols/facebook/mqtt.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "account.h"
 #include "eventloop.h"
 #include "sslconn.h"
 
diff --git a/libpurple/protocols/facebook/mqtt.h b/libpurple/protocols/facebook/mqtt.h
--- a/libpurple/protocols/facebook/mqtt.h
+++ b/libpurple/protocols/facebook/mqtt.h
@@ -25,6 +25,8 @@
 #include <glib.h>
 #include <string.h>
 
+#include "connection.h"
+
 #define FB_MQTT_NAME "MQIsdp"
 #define FB_MQTT_VERS 3
 #define FB_MQTT_KA   60
diff --git a/libpurple/protocols/facebook/util.c b/libpurple/protocols/facebook/util.c
--- a/libpurple/protocols/facebook/util.c
+++ b/libpurple/protocols/facebook/util.c
@@ -25,7 +25,10 @@
 #include <string.h>
 #include <zlib.h>
 
+#include "blistnodetypes.h"
+#include "buddylist.h"
 #include "glibcompat.h"
+#include "request.h"
 
 #include "util.h"
 
diff --git a/libpurple/protocols/facebook/util.h b/libpurple/protocols/facebook/util.h
--- a/libpurple/protocols/facebook/util.h
+++ b/libpurple/protocols/facebook/util.h
@@ -24,6 +24,11 @@
 
 #include <glib.h>
 
+#include <libpurple/util.h>
+
+#include "account.h"
+#include "conversationtypes.h"
+#include "debug.h"
 #include "connection.h"
 
 #define FB_UTIL_DEBUG_INFO (        \