Fix some include loops

Wed, 16 Nov 2022 22:34:18 -0600

author
Gary Kramlich <grim@reaperworld.com>
date
Wed, 16 Nov 2022 22:34:18 -0600
changeset 41917
b3eda1d781c6
parent 41916
4ee9cb957595
child 41918
106ae46b290b

Fix some include loops

This is needed for something else I'm working on, but it was much easier to
find/fix outside of that code.

Testing Done:
Compiled

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

libpurple/purplechatconversation.c file | annotate | diff | comparison | revisions
libpurple/purplecontact.h file | annotate | diff | comparison | revisions
libpurple/purpleconversation.h file | annotate | diff | comparison | revisions
libpurple/request.h file | annotate | diff | comparison | revisions
--- a/libpurple/purplechatconversation.c	Wed Nov 16 22:31:08 2022 -0600
+++ b/libpurple/purplechatconversation.c	Wed Nov 16 22:34:18 2022 -0600
@@ -28,6 +28,7 @@
 #include "purplechatconversation.h"
 #include "purpleenums.h"
 #include "purpleprivate.h"
+#include "request.h"
 #include "server.h"
 
 typedef struct {
--- a/libpurple/purplecontact.h	Wed Nov 16 22:31:08 2022 -0600
+++ b/libpurple/purplecontact.h	Wed Nov 16 22:34:18 2022 -0600
@@ -29,6 +29,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <libpurple/account.h>
+#include <libpurple/purplepresence.h>
 #include <libpurple/purpletags.h>
 
 G_BEGIN_DECLS
--- a/libpurple/purpleconversation.h	Wed Nov 16 22:31:08 2022 -0600
+++ b/libpurple/purpleconversation.h	Wed Nov 16 22:34:18 2022 -0600
@@ -29,12 +29,12 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <purplemessage.h>
-
 #define PURPLE_TYPE_CONVERSATION (purple_conversation_get_type())
 G_DECLARE_DERIVABLE_TYPE(PurpleConversation, purple_conversation, PURPLE,
                          CONVERSATION, GObject)
 
+#include <purplemessage.h>
+
 /**
  * PurpleConversationUpdateType:
  * @PURPLE_CONVERSATION_UPDATE_ADD: The buddy associated with the conversation
--- a/libpurple/request.h	Wed Nov 16 22:31:08 2022 -0600
+++ b/libpurple/request.h	Wed Nov 16 22:34:18 2022 -0600
@@ -32,9 +32,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "purpleconversation.h"
-#include "request-datasheet.h"
-
 #define PURPLE_TYPE_REQUEST_UI_OPS (purple_request_ui_ops_get_type())
 
 /**
@@ -68,6 +65,8 @@
 typedef struct _PurpleRequestUiOps PurpleRequestUiOps;
 
 #include "account.h"
+#include "purpleconversation.h"
+#include "request-datasheet.h"
 
 #define PURPLE_DEFAULT_ACTION_NONE	-1
 

mercurial