HGKeeper

pidgin/pidgin

Stop including internal.h everywhere when we really don't need it.

20 months ago, Gary Kramlich

ca22b00972d4

Parents 187e56aa29b3
Children 9bcd6ad114eb

Stop including internal.h everywhere when we really don't need it.

Testing Done:
Compiled, but didn't test on windows. As such I left all the networking stuff untouched as that's where windows will really need it and that can be done in another rr.

Reviewed at https://reviews.imfreedom.org/r/1764/

43 files changed, 14 insertions(+), 59 deletions(-)

+0 -2

libpurple/account.c

+0 -1

libpurple/accounts.c

+0 -1

libpurple/blistnode.c

+0 -1

libpurple/buddy.c

+0 -1

libpurple/buddyicon.c

+0 -1

libpurple/buddylist.c

+0 -1

libpurple/chat.c

+0 -1

libpurple/circularbuffer.c

+0 -2

libpurple/cmds.c

+0 -2

libpurple/connection.c

+0 -1

libpurple/contact.c

+0 -1

libpurple/conversations.c

+4 -1

libpurple/core.c

+0 -1

libpurple/countingnode.c

+3 -1

libpurple/eventloop.c

+0 -1

libpurple/group.c

+0 -2

libpurple/image.c

+0 -2

libpurple/media.c

+0 -2

libpurple/media/backend-iface.c

+0 -1

libpurple/media/codec.c

+0 -2

libpurple/mediamanager.c

+0 -1

libpurple/notify.c

+0 -2

libpurple/pluginpref.c

+3 -1

libpurple/plugins.c

+4 -2

libpurple/prefs.c

+0 -1

libpurple/protocols.c

+0 -1

libpurple/proxy.c

+0 -1

libpurple/purpleaccountoption.c

+0 -2

libpurple/purpleconversation.c

+0 -1

libpurple/purplegio.c

+0 -2

libpurple/purplemessage.c

+0 -2

libpurple/purpleplugininfo.c

+0 -1

libpurple/purplewhiteboard.c

+0 -1

libpurple/queuedoutputstream.c

+0 -2

libpurple/request.c

+0 -2

libpurple/roomlist.c

+0 -2

libpurple/savedstatuses.c

+0 -1

+0 -1

+0 -1

+0 -2

+0 -1

+0 -1

~~--- a/libpurple/account.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/account.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "accounts.h"

#include "core.h"

#include "debug.h"

~~--- a/libpurple/accounts.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/accounts.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "accounts.h"

#include "core.h"

#include "debug.h"

~~--- a/libpurple/blistnode.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/blistnode.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "blistnode.h"

#include "buddy.h"

~~--- a/libpurple/buddy.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/buddy.c Mon Sep 12 22:54:13 2022 -0500

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

#include "buddy.h"

#include "debug.h"

~~-#include "internal.h"~~

#include "purplebuddypresence.h"

#include "purpleconversationmanager.h"

#include "purpleprotocolclient.h"

~~--- a/libpurple/buddyicon.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/buddyicon.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "buddyicon.h"

#include "debug.h"

#include "image.h"

~~--- a/libpurple/buddylist.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/buddylist.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "account.h"

#include "buddylist.h"

#include "debug.h"

~~--- a/libpurple/chat.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/chat.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "chat.h"

#include "purpleprotocolchat.h"

#include "util.h"

~~--- a/libpurple/circularbuffer.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/circularbuffer.c Mon Sep 12 22:54:13 2022 -0500

@@ -16,7 +16,6 @@

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

#include "circularbuffer.h"

~~--- a/libpurple/cmds.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/cmds.c Mon Sep 12 22:54:13 2022 -0500

@@ -16,8 +16,6 @@

~~-#include "internal.h"~~

#include "account.h"

#include "purplemarkup.h"

#include "cmds.h"

~~--- a/libpurple/connection.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/connection.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "account.h"

#include "buddylist.h"

#include "connection.h"

~~--- a/libpurple/contact.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/contact.c Mon Sep 12 22:54:13 2022 -0500

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

#include "contact.h"

~~-#include "internal.h" /* TODO: this needs to die */~~

#include "purplebuddypresence.h"

#include "purpleconversationmanager.h"

#include "purpleprivate.h"

~~--- a/libpurple/conversations.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/conversations.c Mon Sep 12 22:54:13 2022 -0500

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

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

#include "conversations.h"

#include "purpleprivate.h"

~~--- a/libpurple/core.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/core.c Mon Sep 12 22:54:13 2022 -0500

@@ -23,7 +23,10 @@

#define G_SETTINGS_ENABLE_BACKEND

#include <gio/gsettingsbackend.h>

~~-#include "internal.h"~~

+#ifdef HAVE_CONFIG_H

+# include <config.h>

+#endif /* HAVE_CONFIG_H */

#include "cmds.h"

#include "connection.h"

#include "conversations.h"

~~--- a/libpurple/countingnode.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/countingnode.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "countingnode.h"

typedef struct _PurpleCountingNodePrivate PurpleCountingNodePrivate;

~~--- a/libpurple/eventloop.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/eventloop.c Mon Sep 12 22:54:13 2022 -0500

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

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

+#include <unistd.h>

#include "eventloop.h"

#define PURPLE_GLIB_READ_COND (G_IO_IN | G_IO_HUP | G_IO_ERR)

~~--- a/libpurple/group.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/group.c Mon Sep 12 22:54:13 2022 -0500

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

#include "group.h"

#include "debug.h"

~~-#include "internal.h" /* TODO: we need to kill this */~~

#include "purpleprivate.h"

#include "purpleprotocolserver.h"

~~--- a/libpurple/image.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/image.c Mon Sep 12 22:54:13 2022 -0500

@@ -19,8 +19,6 @@

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

~~-#include "internal.h"~~

#include "debug.h"

#include "image.h"

#include "util.h"

~~--- a/libpurple/media.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/media.c Mon Sep 12 22:54:13 2022 -0500

@@ -18,8 +18,6 @@

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

#include "account.h"

#include "media.h"

#include "media/backend-iface.h"

~~--- a/libpurple/media/backend-iface.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/media/backend-iface.c Mon Sep 12 22:54:13 2022 -0500

@@ -19,8 +19,6 @@

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

~~-#include "internal.h"~~

#include "backend-iface.h"

enum {

~~--- a/libpurple/media/codec.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/media/codec.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "codec.h"

struct _PurpleMediaCodec

~~--- a/libpurple/mediamanager.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/mediamanager.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "account.h"

#include "debug.h"

#include "glibcompat.h"

~~--- a/libpurple/notify.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/notify.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "notify.h"

static PurpleNotifyUiOps *notify_ui_ops = NULL;

~~--- a/libpurple/pluginpref.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/pluginpref.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib.h>

~~-#include "internal.h"~~

#include "debug.h"

#include "pluginpref.h"

#include "prefs.h"

~~--- a/libpurple/plugins.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/plugins.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

+#ifdef HAVE_CONFIG_H

+# include <config.h>

+#endif /* HAVE_CONFIG_H */

#include "core.h"

#include "debug.h"

~~--- a/libpurple/prefs.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/prefs.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,6 +21,10 @@

+#ifdef HAVE_CONFIG_H

+# include <config.h>

+#endif /* HAVE_CONFIG_H */

#include <string.h>

#include <stdio.h>

#include <stdlib.h>

@@ -28,8 +32,6 @@

#include <glib.h>

~~-#include "internal.h"~~

#include "prefs.h"

#include "debug.h"

#include "purplepath.h"

~~--- a/libpurple/protocols.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/protocols.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "debug.h"

#include "network.h"

#include "notify.h"

~~--- a/libpurple/proxy.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/proxy.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "debug.h"

#include "notify.h"

#include "prefs.h"

~~--- a/libpurple/purpleaccountoption.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purpleaccountoption.c Mon Sep 12 22:54:13 2022 -0500

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

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

#include "prefs.h"

#include "purpleaccountoption.h"

~~--- a/libpurple/purpleconversation.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purpleconversation.c Mon Sep 12 22:54:13 2022 -0500

@@ -22,8 +22,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "buddylist.h"

#include "cmds.h"

#include "conversations.h"

~~--- a/libpurple/purplegio.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purplegio.c Mon Sep 12 22:54:13 2022 -0500

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

#include "purplegio.h"

#include "debug.h"

~~-#include "internal.h"~~

#include "proxy.h"

typedef struct {

~~--- a/libpurple/purplemessage.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purplemessage.c Mon Sep 12 22:54:13 2022 -0500

@@ -22,8 +22,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "debug.h"

#include "purpleenums.h"

#include "purplemessage.h"

~~--- a/libpurple/purpleplugininfo.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purpleplugininfo.c Mon Sep 12 22:54:13 2022 -0500

@@ -17,8 +17,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "core.h"

#include "debug.h"

#include "purpleenums.h"

~~--- a/libpurple/purplewhiteboard.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/purplewhiteboard.c Mon Sep 12 22:54:13 2022 -0500

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

~~-#include "internal.h"~~

#include "purplewhiteboard.h"

#include "purpleprotocol.h"

~~--- a/libpurple/queuedoutputstream.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/queuedoutputstream.c Mon Sep 12 22:54:13 2022 -0500

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

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

~~-#include "internal.h"~~

#include "queuedoutputstream.h"

struct _PurpleQueuedOutputStream

~~--- a/libpurple/request.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/request.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "glibcompat.h"

#include "notify.h"

#include "purplemarkup.h"

~~--- a/libpurple/roomlist.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/roomlist.c Mon Sep 12 22:54:13 2022 -0500

@@ -19,8 +19,6 @@

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

~~-#include "internal.h"~~

#include "account.h"

#include "connection.h"

#include "debug.h"

~~--- a/libpurple/savedstatuses.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/savedstatuses.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "accounts.h"

#include "debug.h"

#include "idle.h"

~~--- a/libpurple/server.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/server.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "buddylist.h"

#include "debug.h"

#include "notify.h"

~~--- a/libpurple/signals.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/signals.c Mon Sep 12 22:54:13 2022 -0500

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

* along with this program; if not, write to the Free Software

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

~~-#include "internal.h"~~

#include "debug.h"

#include "signals.h"

~~--- a/libpurple/status.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/status.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "purpleprivate.h"

#include "buddylist.h"

~~--- a/libpurple/upnp.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/upnp.c Mon Sep 12 22:54:13 2022 -0500

@@ -21,8 +21,6 @@

#include <gio/gio.h>

#include <libsoup/soup.h>

~~-#include "internal.h"~~

#include "upnp.h"

#include "glibcompat.h"

~~--- a/libpurple/xfer.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/xfer.c Mon Sep 12 22:54:13 2022 -0500

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

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

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

#include <glib/gstdio.h>

~~--- a/libpurple/xmlnode.c Mon Sep 12 22:49:11 2022 -0500~~

+++ b/libpurple/xmlnode.c Mon Sep 12 22:54:13 2022 -0500

@@ -26,7 +26,6 @@

#include <glib/gi18n-lib.h>

~~-#include "internal.h"~~

#include "debug.h"

#include <libxml/parser.h>