pidgin/pidgin

90d2dee9b3dc
Parents a3d6a07889e7
Children dc06703548a1
Fix the includes for the purpleenums rename

Testing Done:
Full build after a `meson --wipe`

Reviewed at https://reviews.imfreedom.org/r/863/
--- a/libpurple/accounts.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/accounts.c Tue Aug 03 03:04:06 2021 -0500
@@ -25,10 +25,10 @@
#include "accounts.h"
#include "core.h"
#include "debug.h"
-#include "enums.h"
#include "network.h"
#include "purpleconversationmanager.h"
#include "purplecredentialmanager.h"
+#include "purpleenums.h"
#include "purpleprivate.h"
static PurpleAccountUiOps *account_ui_ops = NULL;
--- a/libpurple/connection.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/connection.c Tue Aug 03 03:04:06 2021 -0500
@@ -27,11 +27,11 @@
#include "buddylist.h"
#include "connection.h"
#include "debug.h"
-#include "enums.h"
#include "log.h"
#include "notify.h"
#include "prefs.h"
#include "proxy.h"
+#include "purpleenums.h"
#include "purpleprivate.h"
#include "purpleprotocolserver.h"
#include "purpleprotocolfactory.h"
--- a/libpurple/meson.build Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/meson.build Tue Aug 03 03:04:06 2021 -0500
@@ -254,7 +254,7 @@
enums_h = enums[1]
PURPLE_H_INCLUDES = []
-foreach header : purple_coreheaders + purple_mediaheaders + ['version.h', 'enums.h']
+foreach header : purple_coreheaders + purple_mediaheaders + ['version.h', 'purpleenums.h']
PURPLE_H_INCLUDES += '#include <libpurple/@0@>'.format(header)
endforeach
purple_h_conf = configuration_data()
--- a/libpurple/plugins.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/plugins.c Tue Aug 03 03:04:06 2021 -0500
@@ -26,8 +26,8 @@
#include "core.h"
#include "debug.h"
-#include "enums.h"
#include "plugins.h"
+#include "purpleenums.h"
#include "signals.h"
#include "util.h"
--- a/libpurple/protocol.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/protocol.c Tue Aug 03 03:04:06 2021 -0500
@@ -22,7 +22,7 @@
#include "protocol.h"
-#include "enums.h"
+#include "purpleenums.h"
enum {
PROP_0,
--- a/libpurple/purplechatconversation.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purplechatconversation.c Tue Aug 03 03:04:06 2021 -0500
@@ -24,9 +24,9 @@
#include "internal.h"
#include "debug.h"
-#include "enums.h"
#include "purpleconversationmanager.h"
#include "purplechatconversation.h"
+#include "purpleenums.h"
#include "purpleprivate.h"
typedef struct {
--- a/libpurple/purplechatuser.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purplechatuser.c Tue Aug 03 03:04:06 2021 -0500
@@ -21,7 +21,7 @@
*/
#include "purplechatuser.h"
-#include "enums.h"
+#include "purpleenums.h"
struct _PurpleChatUser {
GObject parent;
--- a/libpurple/purpleconversation.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purpleconversation.c Tue Aug 03 03:04:06 2021 -0500
@@ -27,12 +27,12 @@
#include "buddylist.h"
#include "cmds.h"
#include "debug.h"
-#include "enums.h"
#include "notify.h"
#include "prefs.h"
#include "protocol.h"
#include "purpleconversation.h"
#include "purpleconversationmanager.h"
+#include "purpleenums.h"
#include "purplemarkup.h"
#include "purpleprivate.h"
#include "purpleprotocolclient.h"
--- a/libpurple/purpleimconversation.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purpleimconversation.c Tue Aug 03 03:04:06 2021 -0500
@@ -22,8 +22,8 @@
#include <libpurple/purpleimconversation.h>
#include <libpurple/debug.h>
-#include <libpurple/enums.h>
#include <libpurple/purpleconversationmanager.h>
+#include <libpurple/purpleenums.h>
#include <libpurple/purpleprivate.h>
#include <libpurple/purpleprotocolclient.h>
--- a/libpurple/purplemessage.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purplemessage.c Tue Aug 03 03:04:06 2021 -0500
@@ -25,8 +25,8 @@
#include "internal.h"
#include "debug.h"
+#include "purpleenums.h"
#include "purplemessage.h"
-#include "enums.h"
#include "purpleprivate.h"
/**
--- a/libpurple/purpleplugininfo.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/purpleplugininfo.c Tue Aug 03 03:04:06 2021 -0500
@@ -21,7 +21,7 @@
#include "core.h"
#include "debug.h"
-#include "enums.h"
+#include "purpleenums.h"
#include "util.h"
#include "purpleplugininfo.h"
--- a/libpurple/xfer.c Tue Aug 03 00:39:41 2021 -0500
+++ b/libpurple/xfer.c Tue Aug 03 03:04:06 2021 -0500
@@ -28,7 +28,6 @@
#include <glib/gstdio.h>
#include "debug.h"
-#include "enums.h"
#include "glibcompat.h"
#include "image-store.h"
#include "network.h"
@@ -37,6 +36,7 @@
#include "proxy.h"
#include "purple-gio.h"
#include "purpleconversationmanager.h"
+#include "purpleenums.h"
#include "request.h"
#include "util.h"
#include "xfer.h"