move all protocols, purple plugins, and purple tests to use purple.h instead of including files individually
--- a/libpurple/plugins/keyrings/kwallet/purplekwallet.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.h Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
--- a/libpurple/protocols/facebook/api.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/api.h Fri May 01 04:42:52 2020 -0500
@@ -35,7 +35,7 @@
--- a/libpurple/protocols/facebook/data.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/data.c Fri May 01 04:42:52 2020 -0500
@@ -22,7 +22,7 @@
#include <libsoup/soup.h>
--- a/libpurple/protocols/facebook/data.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/data.h Fri May 01 04:42:52 2020 -0500
@@ -33,8 +33,7 @@
--- a/libpurple/protocols/facebook/facebook.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/facebook.c Fri May 01 04:42:52 2020 -0500
@@ -20,34 +20,7 @@
-#include "conversation.h"
-#include "conversations.h"
-#include "conversationtypes.h"
-#include "image-store.h"
-#include "purpleaccountoption.h"
--- a/libpurple/protocols/facebook/mqtt.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/mqtt.c Fri May 01 04:42:52 2020 -0500
@@ -25,10 +25,7 @@
-#include "queuedoutputstream.h"
--- a/libpurple/protocols/facebook/mqtt.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/mqtt.h Fri May 01 04:42:52 2020 -0500
@@ -34,7 +34,7 @@
#define FB_TYPE_MQTT fb_mqtt_get_type()
#define FB_TYPE_MQTT_MESSAGE fb_mqtt_message_get_type()
--- a/libpurple/protocols/facebook/util.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/util.c Fri May 01 04:42:52 2020 -0500
@@ -25,11 +25,7 @@
-#include "conversations.h"
--- a/libpurple/protocols/facebook/util.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/facebook/util.h Fri May 01 04:42:52 2020 -0500
@@ -33,13 +33,7 @@
-#include <libpurple/util.h>
-#include "conversationtypes.h"
-#include "conversation.h"
--- a/libpurple/protocols/gg/account.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/account.c Fri May 01 04:42:52 2020 -0500
@@ -30,7 +30,6 @@
--- a/libpurple/protocols/gg/avatar.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/avatar.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
#include "oauth/oauth-purple.h"
--- a/libpurple/protocols/gg/blist.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/blist.c Fri May 01 04:42:52 2020 -0500
@@ -22,7 +22,6 @@
--- a/libpurple/protocols/gg/blist.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/blist.h Fri May 01 04:42:52 2020 -0500
@@ -23,7 +23,7 @@
#ifndef PURPLE_GG_BLIST_H
#define PURPLE_GG_BLIST_H
ggp_buddylist_send(PurpleConnection *gc);
--- a/libpurple/protocols/gg/chat.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/chat.c Fri May 01 04:42:52 2020 -0500
@@ -27,8 +27,6 @@
#include "message-prpl.h"
--- a/libpurple/protocols/gg/edisc.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/edisc.c Fri May 01 04:42:52 2020 -0500
@@ -27,8 +27,6 @@
--- a/libpurple/protocols/gg/gg.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/gg.h Fri May 01 04:42:52 2020 -0500
@@ -31,7 +31,8 @@
--- a/libpurple/protocols/gg/html.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/html.c Fri May 01 04:42:52 2020 -0500
@@ -27,8 +27,6 @@
--- a/libpurple/protocols/gg/image-prpl.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/image-prpl.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
--- a/libpurple/protocols/gg/libgadu-events.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/libgadu-events.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
#include "libgadu-events.h"
--- a/libpurple/protocols/gg/libgaduw.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/libgaduw.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
--- a/libpurple/protocols/gg/message-prpl.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/message-prpl.c Fri May 01 04:42:52 2020 -0500
@@ -27,9 +27,6 @@
#include "message-prpl.h"
-#include <image-store.h>
--- a/libpurple/protocols/gg/multilogon.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/multilogon.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
--- a/libpurple/protocols/gg/oauth/oauth-purple.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c Fri May 01 04:42:52 2020 -0500
@@ -34,7 +34,7 @@
#define GGP_OAUTH_RESPONSE_MAX 10240
--- a/libpurple/protocols/gg/pubdir-prpl.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/pubdir-prpl.c Fri May 01 04:42:52 2020 -0500
@@ -30,9 +30,6 @@
#include "oauth/oauth-purple.h"
--- a/libpurple/protocols/gg/purplew.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/purplew.c Fri May 01 04:42:52 2020 -0500
@@ -29,9 +29,6 @@
guint ggp_purplew_http_input_add(struct gg_http *http_req,
--- a/libpurple/protocols/gg/resolver-purple.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/resolver-purple.c Fri May 01 04:42:52 2020 -0500
@@ -28,7 +28,6 @@
#include "resolver-purple.h"
--- a/libpurple/protocols/gg/roster.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/roster.c Fri May 01 04:42:52 2020 -0500
@@ -34,8 +34,6 @@
#define GGP_ROSTER_SYNC_SETT "gg-synchronized"
#define GGP_ROSTER_DEBUG 0
#define GGP_ROSTER_GROUPID_DEFAULT "00000000-0000-0000-0000-000000000000"
--- a/libpurple/protocols/gg/servconn.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/servconn.c Fri May 01 04:42:52 2020 -0500
@@ -31,8 +31,6 @@
#define GGP_SERVCONN_HISTORY_PREF "/plugins/prpl/gg/server_history"
#define GGP_SERVCONN_HISTORY_MAXLEN 15
--- a/libpurple/protocols/gg/servconn.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/servconn.h Fri May 01 04:42:52 2020 -0500
@@ -31,7 +31,7 @@
#define PURPLE_GG_SERVCONN_H
-#include <purpleaccountoption.h>
void ggp_servconn_setup(PurpleAccountOption *server_option);
void ggp_servconn_cleanup(void);
--- a/libpurple/protocols/gg/status.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/status.c Fri May 01 04:42:52 2020 -0500
@@ -30,8 +30,6 @@
--- a/libpurple/protocols/gg/tcpsocket.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/tcpsocket.c Fri May 01 04:42:52 2020 -0500
@@ -29,9 +29,6 @@
GCancellable *cancellable;
--- a/libpurple/protocols/gg/utils.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/utils.c Fri May 01 04:42:52 2020 -0500
@@ -31,8 +31,6 @@
uin_t ggp_str_to_uin(const char *str)
--- a/libpurple/protocols/gg/validator.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/validator.h Fri May 01 04:42:52 2020 -0500
@@ -31,7 +31,7 @@
#define PURPLE_GG_VALIDATOR_H
gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
--- a/libpurple/protocols/gg/xml.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/xml.c Fri May 01 04:42:52 2020 -0500
@@ -29,8 +29,6 @@
gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var)
--- a/libpurple/protocols/gg/xml.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/gg/xml.h Fri May 01 04:42:52 2020 -0500
@@ -31,7 +31,7 @@
gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var);
gboolean ggp_xml_get_bool(const PurpleXmlNode *xml, gchar *childName, gboolean *var);
--- a/libpurple/protocols/jabber/adhoccommands.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/adhoccommands.c Fri May 01 04:42:52 2020 -0500
@@ -22,13 +22,12 @@
#include "adhoccommands.h"
static void do_adhoc_ignoreme(JabberStream *js, ...) {
/* we don't have to do anything */
--- a/libpurple/protocols/jabber/auth.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth.c Fri May 01 04:42:52 2020 -0500
@@ -21,14 +21,7 @@
-#include "conversation.h"
--- a/libpurple/protocols/jabber/auth.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth.h Fri May 01 04:42:52 2020 -0500
@@ -27,8 +27,9 @@
typedef struct _JabberSaslMech JabberSaslMech;
JABBER_SASL_STATE_FAIL = -1, /* Abort, Retry, Fail? */
--- a/libpurple/protocols/jabber/auth_cyrus.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth_cyrus.c Fri May 01 04:42:52 2020 -0500
@@ -21,9 +21,7 @@
--- a/libpurple/protocols/jabber/auth_digest_md5.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth_digest_md5.c Fri May 01 04:42:52 2020 -0500
@@ -21,10 +21,7 @@
#include "auth_digest_md5.h"
--- a/libpurple/protocols/jabber/auth_plain.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth_plain.c Fri May 01 04:42:52 2020 -0500
@@ -21,12 +21,7 @@
--- a/libpurple/protocols/jabber/auth_scram.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth_scram.c Fri May 01 04:42:52 2020 -0500
@@ -21,12 +21,11 @@
static const JabberScramHash hashes[] = {
{ "-SHA-1", G_CHECKSUM_SHA1 },
--- a/libpurple/protocols/jabber/auth_webex.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/auth_webex.c Fri May 01 04:42:52 2020 -0500
@@ -21,12 +21,7 @@
--- a/libpurple/protocols/jabber/bosh.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/bosh.c Fri May 01 04:42:52 2020 -0500
@@ -21,8 +21,7 @@
#include <libsoup/soup.h>
--- a/libpurple/protocols/jabber/buddy.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/buddy.c Fri May 01 04:42:52 2020 -0500
@@ -21,13 +21,7 @@
-#include "image-store.h"
--- a/libpurple/protocols/jabber/buddy.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/buddy.h Fri May 01 04:42:52 2020 -0500
@@ -27,7 +27,7 @@
typedef struct _JabberBuddy JabberBuddy;
--- a/libpurple/protocols/jabber/caps.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/caps.c Fri May 01 04:42:52 2020 -0500
@@ -22,12 +22,11 @@
#define JABBER_CAPS_FILENAME "xmpp-caps.xml"
--- a/libpurple/protocols/jabber/chat.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/chat.c Fri May 01 04:42:52 2020 -0500
@@ -21,12 +21,7 @@
-#include "protocol.h" /* for PurpleProtocolChatEntry */
--- a/libpurple/protocols/jabber/chat.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/chat.h Fri May 01 04:42:52 2020 -0500
@@ -26,10 +26,7 @@
#define PURPLE_JABBER_CHAT_H
-#include "conversation.h"
--- a/libpurple/protocols/jabber/data.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/data.c Fri May 01 04:42:52 2020 -0500
@@ -27,10 +27,9 @@
static GHashTable *local_data_by_alt = NULL;
--- a/libpurple/protocols/jabber/data.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/data.h Fri May 01 04:42:52 2020 -0500
@@ -24,7 +24,8 @@
#ifndef PURPLE_JABBER_DATA_H
#define PURPLE_JABBER_DATA_H
--- a/libpurple/protocols/jabber/disco.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/disco.c Fri May 01 04:42:52 2020 -0500
@@ -22,10 +22,7 @@
#include "adhoccommands.h"
--- a/libpurple/protocols/jabber/google/gmail.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/gmail.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,8 @@
--- a/libpurple/protocols/jabber/google/google.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,7 @@
--- a/libpurple/protocols/jabber/google/google_p2p.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google_p2p.c Fri May 01 04:42:52 2020 -0500
@@ -23,12 +23,12 @@
#include "jingle/jingle.h"
--- a/libpurple/protocols/jabber/google/google_presence.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google_presence.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,8 @@
#include "google_presence.h"
void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
--- a/libpurple/protocols/jabber/google/google_presence.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google_presence.h Fri May 01 04:42:52 2020 -0500
@@ -21,9 +21,10 @@
#ifndef PURPLE_JABBER_GOOGLE_PRESENCE_H_
#define PURPLE_JABBER_GOOGLE_PRESENCE_H_
void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
char *jabber_google_presence_outgoing(PurpleStatus *tune);
--- a/libpurple/protocols/jabber/google/google_roster.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google_roster.c Fri May 01 04:42:52 2020 -0500
@@ -19,11 +19,11 @@
#include "google_roster.h"
void jabber_google_roster_outgoing(JabberStream *js, PurpleXmlNode *query, PurpleXmlNode *item)
--- a/libpurple/protocols/jabber/google/google_session.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/google_session.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,8 @@
#include "google_session.h"
--- a/libpurple/protocols/jabber/google/jingleinfo.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/jingleinfo.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,8 @@
--- a/libpurple/protocols/jabber/google/relay.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/google/relay.c Fri May 01 04:42:52 2020 -0500
@@ -19,7 +19,7 @@
--- a/libpurple/protocols/jabber/ibb.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/ibb.c Fri May 01 04:42:52 2020 -0500
@@ -22,9 +22,9 @@
#define JABBER_IBB_SESSION_DEFAULT_BLOCK_SIZE 4096
--- a/libpurple/protocols/jabber/iq.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/iq.c Fri May 01 04:42:52 2020 -0500
@@ -21,10 +21,7 @@
--- a/libpurple/protocols/jabber/jabber.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jabber.c Fri May 01 04:42:52 2020 -0500
@@ -21,27 +21,7 @@
-#include "conversation.h"
-#include "purpleaccountoption.h"
--- a/libpurple/protocols/jabber/jabber.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jabber.h Fri May 01 04:42:52 2020 -0500
@@ -61,14 +61,7 @@
#include <libsoup/soup.h>
-#include "circularbuffer.h"
-#include "mediamanager.h"
-#include "queuedoutputstream.h"
--- a/libpurple/protocols/jabber/jingle/content.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/content.c Fri May 01 04:42:52 2020 -0500
@@ -23,8 +23,8 @@
--- a/libpurple/protocols/jabber/jingle/iceudp.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/iceudp.c Fri May 01 04:42:52 2020 -0500
@@ -23,10 +23,10 @@
--- a/libpurple/protocols/jabber/jingle/jingle.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/jingle.c Fri May 01 04:42:52 2020 -0500
@@ -24,10 +24,9 @@
#include "google/google_p2p.h"
--- a/libpurple/protocols/jabber/jingle/rawudp.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/rawudp.c Fri May 01 04:42:52 2020 -0500
@@ -23,10 +23,10 @@
--- a/libpurple/protocols/jabber/jingle/rtp.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/rtp.h Fri May 01 04:42:52 2020 -0500
@@ -32,9 +32,9 @@
--- a/libpurple/protocols/jabber/jingle/session.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/session.c Fri May 01 04:42:52 2020 -0500
@@ -23,9 +23,9 @@
--- a/libpurple/protocols/jabber/jingle/transport.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jingle/transport.c Fri May 01 04:42:52 2020 -0500
@@ -23,10 +23,10 @@
--- a/libpurple/protocols/jabber/jutil.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/jutil.c Fri May 01 04:42:52 2020 -0500
@@ -21,12 +21,7 @@
-#include "conversation.h"
--- a/libpurple/protocols/jabber/message.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/message.c Fri May 01 04:42:52 2020 -0500
@@ -21,22 +21,15 @@
-#include "smiley-custom.h"
-#include "smiley-parser.h"
#include "adhoccommands.h"
#include "google/google.h"
--- a/libpurple/protocols/jabber/message.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/message.h Fri May 01 04:42:52 2020 -0500
@@ -25,9 +25,9 @@
#ifndef PURPLE_JABBER_MESSAGE_H
#define PURPLE_JABBER_MESSAGE_H
--- a/libpurple/protocols/jabber/oob.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/oob.c Fri May 01 04:42:52 2020 -0500
@@ -21,9 +21,7 @@
--- a/libpurple/protocols/jabber/parser.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/parser.c Fri May 01 04:42:52 2020 -0500
@@ -24,12 +24,10 @@
#include <libxml/parser.h>
jabber_parser_element_start_libxml(void *user_data,
--- a/libpurple/protocols/jabber/ping.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/ping.c Fri May 01 04:42:52 2020 -0500
@@ -23,8 +23,7 @@
--- a/libpurple/protocols/jabber/ping.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/ping.h Fri May 01 04:42:52 2020 -0500
@@ -25,9 +25,10 @@
#ifndef PURPLE_JABBER_PING_H
#define PURPLE_JABBER_PING_H
void jabber_ping_parse(JabberStream *js, const char *from,
JabberIqType, const char *id, PurpleXmlNode *child);
--- a/libpurple/protocols/jabber/presence.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/presence.c Fri May 01 04:42:52 2020 -0500
@@ -21,16 +21,7 @@
-#include "conversation.h"
--- a/libpurple/protocols/jabber/presence.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/presence.h Fri May 01 04:42:52 2020 -0500
@@ -39,11 +39,12 @@
typedef struct _JabberPresenceChatInfo JabberPresenceChatInfo;
typedef struct _JabberPresence JabberPresence;
struct _JabberPresenceChatInfo {
--- a/libpurple/protocols/jabber/roster.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/roster.c Fri May 01 04:42:52 2020 -0500
@@ -21,9 +21,7 @@
--- a/libpurple/protocols/jabber/si.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/si.c Fri May 01 04:42:52 2020 -0500
@@ -23,13 +23,7 @@
--- a/libpurple/protocols/jabber/tests/test_jabber_caps.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/tests/test_jabber_caps.c Fri May 01 04:42:52 2020 -0500
@@ -1,6 +1,7 @@
#include "protocols/jabber/caps.h"
--- a/libpurple/protocols/jabber/tests/test_jabber_digest_md5.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/tests/test_jabber_digest_md5.c Fri May 01 04:42:52 2020 -0500
@@ -1,6 +1,7 @@
#include "protocols/jabber/auth_digest_md5.h"
#include "protocols/jabber/jutil.h"
--- a/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri May 01 04:42:52 2020 -0500
@@ -1,9 +1,7 @@
-#include "conversation.h"
#include "protocols/jabber/jutil.h"
PurpleTestStringData test_jabber_util_get_resource_exists_data[] = {
--- a/libpurple/protocols/jabber/tests/test_jabber_scram.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/tests/test_jabber_scram.c Fri May 01 04:42:52 2020 -0500
@@ -1,7 +1,7 @@
#include "protocols/jabber/auth_scram.h"
#include "protocols/jabber/jutil.h"
--- a/libpurple/protocols/jabber/useravatar.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/useravatar.c Fri May 01 04:42:52 2020 -0500
@@ -22,12 +22,12 @@
#include <libsoup/soup.h>
#define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
--- a/libpurple/protocols/jabber/useravatar.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/useravatar.h Fri May 01 04:42:52 2020 -0500
@@ -25,7 +25,8 @@
#define PURPLE_JABBER_USERAVATAR_H
/* Implementation of XEP-0084 */
--- a/libpurple/protocols/jabber/usermood.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/usermood.c Fri May 01 04:42:52 2020 -0500
@@ -22,13 +22,11 @@
static PurpleMood moods[] = {
{"afraid", N_("Afraid"), NULL},
--- a/libpurple/protocols/jabber/usernick.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/usernick.c Fri May 01 04:42:52 2020 -0500
@@ -22,13 +22,11 @@
static void jabber_nick_cb(JabberStream *js, const char *from, PurpleXmlNode *items) {
/* it doesn't make sense to have more than one item here, so let's just pick the first one */
--- a/libpurple/protocols/jabber/usertune.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/usertune.c Fri May 01 04:42:52 2020 -0500
@@ -22,13 +22,11 @@
static void jabber_tune_cb(JabberStream *js, const char *from, PurpleXmlNode *items) {
/* it doesn't make sense to have more than one item here, so let's just pick the first one */
--- a/libpurple/protocols/jabber/xdata.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/xdata.c Fri May 01 04:42:52 2020 -0500
@@ -21,8 +21,7 @@
--- a/libpurple/protocols/jabber/xdata.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/jabber/xdata.h Fri May 01 04:42:52 2020 -0500
@@ -26,7 +26,8 @@
#define PURPLE_JABBER_XDATA_H
--- a/libpurple/protocols/novell/nmconn.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/nmconn.c Fri May 01 04:42:52 2020 -0500
@@ -23,7 +23,7 @@
--- a/libpurple/protocols/novell/nmcontact.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/nmcontact.c Fri May 01 04:42:52 2020 -0500
@@ -20,10 +20,10 @@
--- a/libpurple/protocols/novell/nmrtf.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/nmrtf.c Fri May 01 04:42:52 2020 -0500
@@ -28,9 +28,8 @@
/* Internal RTF parser error codes */
#define NMRTF_OK 0 /* Everything's fine! */
--- a/libpurple/protocols/novell/nmuser.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/nmuser.c Fri May 01 04:42:52 2020 -0500
@@ -20,12 +20,12 @@
#include "nmuserrecord.h"
/* This is the template that we wrap outgoing messages in, since the other
* GW Messenger clients expect messages to be in RTF.
--- a/libpurple/protocols/novell/nmuser.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/nmuser.h Fri May 01 04:42:52 2020 -0500
@@ -47,7 +47,8 @@
#include "nmconference.h"
--- a/libpurple/protocols/novell/novell.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/novell.c Fri May 01 04:42:52 2020 -0500
@@ -19,21 +19,10 @@
-#include "purpleaccountoption.h"
#define DEFAULT_PORT 8300
#define NOVELL_CONNECT_STEPS 4
--- a/libpurple/protocols/novell/novell.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/novell/novell.h Fri May 01 04:42:52 2020 -0500
@@ -25,7 +25,7 @@
#define NOVELL_TYPE_PROTOCOL (novell_protocol_get_type())
#define NOVELL_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NOVELL_TYPE_PROTOCOL, NovellProtocol))
--- a/libpurple/protocols/sametime/im_mime.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/sametime/im_mime.c Fri May 01 04:42:52 2020 -0500
@@ -26,8 +26,7 @@
-#include "image-store.h"
--- a/libpurple/protocols/sametime/sametime.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/sametime/sametime.c Fri May 01 04:42:52 2020 -0500
@@ -32,20 +32,7 @@
-#include "circularbuffer.h"
-#include "conversation.h"
-#include "image-store.h"
-#include "purpleaccountoption.h"
-#include "purpleaccountusersplit.h"
--- a/libpurple/protocols/sametime/tests/test_sametime_im_mime.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/sametime/tests/test_sametime_im_mime.c Fri May 01 04:42:52 2020 -0500
@@ -25,9 +25,7 @@
-#include "image-store.h"
#include "protocols/sametime/im_mime.h"
--- a/libpurple/protocols/silc/ops.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/silc/ops.c Fri May 01 04:42:52 2020 -0500
@@ -18,7 +18,6 @@
-#include "image-store.h"
PURPLE_BEGIN_IGNORE_CAST_ALIGN
PURPLE_END_IGNORE_CAST_ALIGN
--- a/libpurple/protocols/silc/silc.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/silc/silc.c Fri May 01 04:42:52 2020 -0500
@@ -26,7 +26,6 @@
extern SilcClientOperations ops;
--- a/libpurple/protocols/silc/silcpurple.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/silc/silcpurple.h Fri May 01 04:42:52 2020 -0500
@@ -24,18 +24,7 @@
-#include "conversation.h"
#define SILCPURPLE_TYPE_PROTOCOL (silcpurple_protocol_get_type())
#define SILCPURPLE_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SILCPURPLE_TYPE_PROTOCOL, SilcProtocol))
--- a/libpurple/protocols/silc/util.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/silc/util.c Fri May 01 04:42:52 2020 -0500
@@ -18,8 +18,7 @@
-#include "glibcompat.h" /* for purple_g_stat on win32 */
-#include "image-store.h"
PURPLE_BEGIN_IGNORE_CAST_ALIGN
--- a/libpurple/protocols/silc/wb.h Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/silc/wb.h Fri May 01 04:42:52 2020 -0500
@@ -21,7 +21,6 @@
silcpurple_wb_init(SilcPurple sg, SilcClientEntry client_entry);
--- a/libpurple/protocols/zephyr/zephyr.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/protocols/zephyr/zephyr.c Fri May 01 04:42:52 2020 -0500
@@ -28,15 +28,7 @@
#include "libpurple/internal.h"
-#include "purpleaccountoption.h"
--- a/libpurple/tests/test_queued_output_stream.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/tests/test_queued_output_stream.c Fri May 01 04:42:52 2020 -0500
@@ -23,7 +23,7 @@
-#include <queuedoutputstream.h>
static const gsize test_bytes_data_len = 5;
static const guint8 test_bytes_data[] = "12345";
--- a/libpurple/tests/test_trie.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/tests/test_trie.c Fri May 01 04:42:52 2020 -0500
@@ -22,7 +22,7 @@
--- a/libpurple/tests/test_util.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/tests/test_util.c Fri May 01 04:42:52 2020 -0500
@@ -22,7 +22,7 @@
/******************************************************************************
--- a/libpurple/tests/test_xmlnode.c Fri May 01 03:09:57 2020 -0500
+++ b/libpurple/tests/test_xmlnode.c Fri May 01 04:42:52 2020 -0500
@@ -22,7 +22,7 @@
* If we really wanted to test the billion laughs attack we would