HGKeeper

pidgin/pidgin

Remove glibcompat.h from all the files that don't actually need it.

2019-11-15, Gary Kramlich

fb4b0ae193c0

Parents 90a6e8b696b2
Children 7690a049a466 75ffd76260fc db020c153465 566c210f7003 cdca03a74387

Remove glibcompat.h from all the files that don't actually need it.

59 files changed, 6 insertions(+), 59 deletions(-)

+0 -1

finch/libfinch.c

+0 -1

libpurple/account.c

+0 -1

libpurple/blistnode.c

+0 -1

libpurple/buddy.c

+0 -1

libpurple/circularbuffer.c

+0 -1

libpurple/connection.c

+0 -1

libpurple/conversation.c

+0 -1

libpurple/conversationtypes.c

+0 -1

libpurple/core.c

+0 -1

libpurple/countingnode.c

+0 -1

libpurple/image-store.c

+0 -1

libpurple/image.c

+1 -1

libpurple/log.c

+0 -1

libpurple/media/backend-fs2.c

+0 -1

libpurple/media/codec.c

+0 -1

libpurple/message.c

+0 -1

libpurple/presence.c

+0 -1

libpurple/protocols/facebook/api.c

+0 -1

libpurple/protocols/facebook/data.c

+0 -1

libpurple/protocols/facebook/facebook.c

+0 -1

libpurple/protocols/facebook/mqtt.c

+0 -1

libpurple/protocols/facebook/util.c

+0 -1

libpurple/protocols/gg/avatar.c

+0 -1

libpurple/protocols/gg/edisc.c

+0 -1

libpurple/protocols/gg/image-prpl.c

+0 -1

libpurple/protocols/gg/message-prpl.c

+0 -1

libpurple/protocols/gg/roster.c

+0 -1

libpurple/protocols/gg/servconn.c

+0 -1

libpurple/protocols/jabber/google/google_p2p.c

+0 -1

libpurple/protocols/jabber/jingle/content.c

+0 -1

libpurple/protocols/jabber/jingle/iceudp.c

+0 -1

libpurple/protocols/jabber/jingle/jingle.c

+0 -1

libpurple/protocols/jabber/jingle/rawudp.c

+0 -1

libpurple/protocols/jabber/jingle/rtp.c

+0 -1

libpurple/protocols/jabber/jingle/session.c

+0 -1

libpurple/protocols/jabber/tests/test_jabber_jutil.c

+0 -1

libpurple/protocols/silc/buddy.c

+1 -1

libpurple/protocols/silc/pk.c

+1 -1

libpurple/protocols/silc/util.c

+0 -1

libpurple/purpleaccountoption.c

+0 -1

libpurple/request-datasheet.c

+0 -1

libpurple/request.c

+0 -1

libpurple/roomlist.c

+0 -1

libpurple/status.c

+0 -1

libpurple/theme-loader.c

+0 -1

libpurple/theme.c

+0 -1

libpurple/util.c

+0 -1

libpurple/whiteboard.c

+1 -1

libpurple/xfer.c

+0 -1

pidgin/gtkblist-theme.c

+0 -1

pidgin/gtkconv.c

+0 -1

pidgin/gtkmenutray.c

+0 -1

pidgin/gtkprefs.c

+0 -1

pidgin/gtksmiley-theme.c

+1 -1

pidgin/gtkutils.c

+1 -1

pidgin/libpidgin.c

+0 -1

pidgin/minidialog.c

+0 -1

pidgin/plugins/imgupload.c

+0 -1

pidgin/plugins/screencap.c

~~--- a/finch/libfinch.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/finch/libfinch.c Fri Nov 15 01:07:08 2019 -0600

@@ -28,7 +28,6 @@

#include "conversation.h"

#include "core.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "log.h"

#include "notify.h"

#include "options.h"

~~--- a/libpurple/account.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/account.c Fri Nov 15 01:07:08 2019 -0600

@@ -19,7 +19,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "accounts.h"

#include "core.h"

~~--- a/libpurple/blistnode.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/blistnode.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

typedef struct _PurpleBlistNodePrivate PurpleBlistNodePrivate;

~~--- a/libpurple/buddy.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/buddy.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "util.h"

typedef struct _PurpleBuddyPrivate PurpleBuddyPrivate;

~~--- a/libpurple/circularbuffer.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/circularbuffer.c Fri Nov 15 01:07:08 2019 -0600

@@ -17,7 +17,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "circularbuffer.h"

~~--- a/libpurple/connection.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/connection.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "account.h"

#include "buddylist.h"

~~--- a/libpurple/conversation.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/conversation.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "buddylist.h"

#include "cmds.h"

~~--- a/libpurple/conversationtypes.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/conversationtypes.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "conversationtypes.h"

#include "debug.h"

#include "enums.h"

~~--- a/libpurple/core.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/core.c Fri Nov 15 01:07:08 2019 -0600

@@ -25,7 +25,6 @@

#include "core.h"

#include "debug.h"

#include "xfer.h"

~~-#include "glibcompat.h"~~

#include "idle.h"

#include "image-store.h"

#include "keyring.h"

~~--- a/libpurple/countingnode.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/countingnode.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "countingnode.h"

typedef struct _PurpleCountingNodePrivate PurpleCountingNodePrivate;

~~--- a/libpurple/image-store.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/image-store.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include "image-store.h"

#include "eventloop.h"

~~-#include "glibcompat.h"~~

#include "util.h"

#define TEMP_IMAGE_TIMEOUT 5

~~--- a/libpurple/image.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/image.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "debug.h"

#include "image.h"

~~--- a/libpurple/log.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/log.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,7 @@

#include "internal.h"

#include "account.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

#include "image-store.h"

#include "log.h"

#include "prefs.h"

~~--- a/libpurple/media/backend-fs2.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/media/backend-fs2.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "backend-fs2.h"

~~--- a/libpurple/media/codec.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/media/codec.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "codec.h"

struct _PurpleMediaCodec

~~--- a/libpurple/message.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/message.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "debug.h"

#include "enums.h"

~~--- a/libpurple/presence.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/presence.c Fri Nov 15 01:07:08 2019 -0600

@@ -19,7 +19,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "debug.h"

#include "presence.h"

~~--- a/libpurple/protocols/facebook/api.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/facebook/api.c Fri Nov 15 01:07:08 2019 -0600

@@ -24,7 +24,6 @@

#include <stdarg.h>

#include <string.h>

~~-#include "glibcompat.h"~~

#include "api.h"

#include "http.h"

~~--- a/libpurple/protocols/facebook/data.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/facebook/data.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include <string.h>

#include "account.h"

~~-#include "glibcompat.h"~~

#include "api.h"

#include "data.h"

~~--- a/libpurple/protocols/facebook/facebook.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/facebook/facebook.c Fri Nov 15 01:07:08 2019 -0600

@@ -32,7 +32,6 @@

#include "conversation.h"

#include "conversations.h"

#include "conversationtypes.h"

~~-#include "glibcompat.h"~~

#include "image.h"

#include "image-store.h"

#include "message.h"

~~--- a/libpurple/protocols/facebook/mqtt.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/facebook/mqtt.c Fri Nov 15 01:07:08 2019 -0600

@@ -27,7 +27,6 @@

#include "account.h"

#include "eventloop.h"

~~-#include "glibcompat.h"~~

#include "purple-gio.h"

#include "queuedoutputstream.h"

~~--- a/libpurple/protocols/facebook/util.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/facebook/util.c Fri Nov 15 01:07:08 2019 -0600

@@ -27,7 +27,6 @@

#include "buddylist.h"

#include "conversations.h"

~~-#include "glibcompat.h"~~

#include "message.h"

#include "request.h"

#include "server.h"

~~--- a/libpurple/protocols/gg/avatar.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/avatar.c Fri Nov 15 01:07:08 2019 -0600

@@ -30,7 +30,6 @@

#include "avatar.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#include "gg.h"

#include "utils.h"

~~--- a/libpurple/protocols/gg/edisc.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/edisc.c Fri Nov 15 01:07:08 2019 -0600

@@ -28,7 +28,6 @@

#include "edisc.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#include "gg.h"

#include "libgaduw.h"

~~--- a/libpurple/protocols/gg/image-prpl.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/image-prpl.c Fri Nov 15 01:07:08 2019 -0600

@@ -30,7 +30,6 @@

#include "image-prpl.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#include "gg.h"

#include "utils.h"

~~--- a/libpurple/protocols/gg/message-prpl.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/message-prpl.c Fri Nov 15 01:07:08 2019 -0600

@@ -28,7 +28,6 @@

#include "message-prpl.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#include <image-store.h>

#include "gg.h"

~~--- a/libpurple/protocols/gg/roster.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/roster.c Fri Nov 15 01:07:08 2019 -0600

@@ -35,7 +35,6 @@

#include "purplew.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#define GGP_ROSTER_SYNC_SETT "gg-synchronized"

#define GGP_ROSTER_DEBUG 0

~~--- a/libpurple/protocols/gg/servconn.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/gg/servconn.c Fri Nov 15 01:07:08 2019 -0600

@@ -32,7 +32,6 @@

#include "utils.h"

#include <debug.h>

~~-#include <glibcompat.h>~~

#define GGP_SERVCONN_HISTORY_PREF "/plugins/prpl/gg/server_history"

#define GGP_SERVCONN_HISTORY_MAXLEN 15

~~--- a/libpurple/protocols/jabber/google/google_p2p.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/google/google_p2p.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "google_p2p.h"

#include "jingle/jingle.h"

~~--- a/libpurple/protocols/jabber/jingle/content.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/content.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "debug.h"

#include "content.h"

~~--- a/libpurple/protocols/jabber/jingle/iceudp.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/iceudp.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "iceudp.h"

#include "jingle.h"

~~--- a/libpurple/protocols/jabber/jingle/jingle.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/jingle.c Fri Nov 15 01:07:08 2019 -0600

@@ -24,7 +24,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "network.h"

#include "content.h"

~~--- a/libpurple/protocols/jabber/jingle/rawudp.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/rawudp.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "rawudp.h"

#include "jingle.h"

~~--- a/libpurple/protocols/jabber/jingle/rtp.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/rtp.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#ifdef USE_VV

~~--- a/libpurple/protocols/jabber/jingle/session.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/jingle/session.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "content.h"

#include "debug.h"

~~--- a/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/jabber/tests/test_jabber_jutil.c Fri Nov 15 01:07:08 2019 -0600

@@ -2,7 +2,6 @@

#include "account.h"

#include "conversation.h"

~~-#include "glibcompat.h"~~

#include "tests.h"

#include "xmlnode.h"

#include "protocols/jabber/jutil.h"

~~--- a/libpurple/protocols/silc/buddy.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/silc/buddy.c Fri Nov 15 01:07:08 2019 -0600

@@ -18,7 +18,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

PURPLE_BEGIN_IGNORE_CAST_ALIGN

#include "silc.h"

PURPLE_END_IGNORE_CAST_ALIGN

~~--- a/libpurple/protocols/silc/pk.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/silc/pk.c Fri Nov 15 01:07:08 2019 -0600

@@ -18,7 +18,7 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

PURPLE_BEGIN_IGNORE_CAST_ALIGN

#include "silc.h"

PURPLE_END_IGNORE_CAST_ALIGN

~~--- a/libpurple/protocols/silc/util.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/protocols/silc/util.c Fri Nov 15 01:07:08 2019 -0600

@@ -18,7 +18,7 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

#include "image-store.h"

PURPLE_BEGIN_IGNORE_CAST_ALIGN

~~--- a/libpurple/purpleaccountoption.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/purpleaccountoption.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "purpleaccountoption.h"

#include "prefs.h"

#include "util.h"

~~-#include "glibcompat.h"~~

* An option for an account.

~~--- a/libpurple/request-datasheet.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/request-datasheet.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include "request-datasheet.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "signals.h"

struct _PurpleRequestDatasheet

~~--- a/libpurple/request.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/request.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "notify.h"

#include "request.h"

#include "debug.h"

~~--- a/libpurple/roomlist.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/roomlist.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "account.h"

#include "connection.h"

~~--- a/libpurple/status.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/status.c Fri Nov 15 01:07:08 2019 -0600

@@ -19,7 +19,6 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "buddylist.h"

#include "core.h"

~~--- a/libpurple/theme-loader.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/theme-loader.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "theme-loader.h"

void purple_theme_loader_set_type_string(PurpleThemeLoader *loader, const gchar *type);

~~--- a/libpurple/theme.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/theme.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "theme.h"

#include "util.h"

~~--- a/libpurple/util.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/util.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "conversation.h"

#include "core.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "notify.h"

#include "protocol.h"

#include "prefs.h"

~~--- a/libpurple/whiteboard.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/whiteboard.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "whiteboard.h"

#include "protocol.h"

~~--- a/libpurple/xfer.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/libpurple/xfer.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,7 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

#include "enums.h"

#include "image-store.h"

~~--- a/pidgin/gtkblist-theme.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtkblist-theme.c Fri Nov 15 01:07:08 2019 -0600

@@ -21,7 +21,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "gtkblist-theme.h"

~~--- a/pidgin/gtkconv.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtkconv.c Fri Nov 15 01:07:08 2019 -0600

@@ -37,7 +37,6 @@

#include "cmds.h"

#include "core.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "idle.h"

#include "image-store.h"

#include "log.h"

~~--- a/pidgin/gtkmenutray.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtkmenutray.c Fri Nov 15 01:07:08 2019 -0600

@@ -23,7 +23,6 @@

#include "gtkmenutray.h"

~~-#include "glibcompat.h"~~

#include "gtk3compat.h"

/******************************************************************************

~~--- a/pidgin/gtkprefs.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtkprefs.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include <talkatu.h>

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "pidgin.h"

#include "debug.h"

~~--- a/pidgin/gtksmiley-theme.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtksmiley-theme.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include "gtksmiley-theme.h"

#include "internal.h"

~~-#include "glibcompat.h"~~

#include "debug.h"

~~--- a/pidgin/gtkutils.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/gtkutils.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,7 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

#include "pidgin.h"

#ifdef _WIN32

~~--- a/pidgin/libpidgin.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/libpidgin.c Fri Nov 15 01:07:08 2019 -0600

@@ -29,7 +29,7 @@

#include "conversation.h"

#include "core.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

+#include "glibcompat.h" /* for purple_g_stat on win32 */

#include "log.h"

#include "network.h"

#include "notify.h"

~~--- a/pidgin/minidialog.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/minidialog.c Fri Nov 15 01:07:08 2019 -0600

@@ -20,7 +20,6 @@

#include "internal.h"

~~-#include "glibcompat.h"~~

#include <gtk/gtk.h>

~~--- a/pidgin/plugins/imgupload.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/plugins/imgupload.c Fri Nov 15 01:07:08 2019 -0600

@@ -22,7 +22,6 @@

#include "internal.h"

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "version.h"

#include "gtk3compat.h"

~~--- a/pidgin/plugins/screencap.c Fri Nov 15 00:16:39 2019 -0600~~

+++ b/pidgin/plugins/screencap.c Fri Nov 15 01:07:08 2019 -0600

@@ -24,7 +24,6 @@

#include <gdk/gdkkeysyms.h>

#include "debug.h"

~~-#include "glibcompat.h"~~

#include "version.h"

#include "gtk3compat.h"