summaryrefslogtreecommitdiff
path: root/libpurple/core.c
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2021-04-12 20:27:47 -0500
committerGary Kramlich <grim@reaperworld.com>2021-04-12 20:27:47 -0500
commit31be44163142f1ed4e1ecfc1be697184b2c29a89 (patch)
tree0c22e93d467e8c0dcbf4d1d8066c26c220aa7e88 /libpurple/core.c
parent91707d71708530db33750cb33a88f9bb383a30c8 (diff)
downloadpidgin-31be44163142f1ed4e1ecfc1be697184b2c29a89.tar.gz
rename conversation.[ch] to purpleconversation.[ch] and split PurpleConversationUiOps out to its own file to avoid circular include issues.
Testing Done: Compiled and ran locally including docs and pot file. The pot file fails as I need to rebase on [596](https://reviews.imfreedom.org/r/596/) Reviewed at https://reviews.imfreedom.org/r/597/
Diffstat (limited to 'libpurple/core.c')
-rw-r--r--libpurple/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpurple/core.c b/libpurple/core.c
index a03665ed9d..e11e6bef13 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -24,7 +24,6 @@
#include "internal.h"
#include "cmds.h"
#include "connection.h"
-#include "conversation.h"
#include "core.h"
#include "debug.h"
#include "xfer.h"
@@ -36,6 +35,7 @@
#include "plugins.h"
#include "prefs.h"
#include "proxy.h"
+#include "purpleconversation.h"
#include "purplecredentialmanager.h"
#include "purplemessage.h"
#include "purpleprivate.h"