From c993b93f225cb98a10ec44e65de38230af260cfe Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 1 Jul 2019 20:25:00 +0300 Subject: [PATCH] purple: add _PurpleProtocolAction fwd declaration This fixes most of the compilation errors against latest 3.x.x API. Add action.h where necessary to get the real type. --- src/purple/purple-plugin-common.c | 1 + src/purple/purple-private.h | 9 +++++++-- src/purple/purple-search.c | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/purple/purple-plugin-common.c b/src/purple/purple-plugin-common.c index 7c44ea80..df2d0211 100644 --- a/src/purple/purple-plugin-common.c +++ b/src/purple/purple-plugin-common.c @@ -37,6 +37,7 @@ #include "version.h" #if PURPLE_VERSION_CHECK(3,0,0) +#include "action.h" #define PURPLE_TYPE_STRING G_TYPE_STRING #define SIPE_PURPLE_ACTION_TO_CONNECTION action->connection #else diff --git a/src/purple/purple-private.h b/src/purple/purple-private.h index d1b49d77..c3f743a8 100644 --- a/src/purple/purple-private.h +++ b/src/purple/purple-private.h @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2017 SIPE Project + * Copyright (C) 2010-2019 SIPE Project * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,11 +44,17 @@ #if PURPLE_VERSION_CHECK(3,0,0) #include "conversationtypes.h" /* PurpleIMTypingState */ #include "plugins.h" /* PurplePlugin */ + +/* Forward declarations */ +struct _PurpleProtocolAction; #else #include "conversation.h" /* PurpleTypingState */ #include "plugin.h" /* PurplePlugin */ #define PurpleIMTypingState PurpleTypingState #define _PurpleProtocolAction _PurplePluginAction + +/* Forward declarations */ +struct _PurplePluginAction; #endif /* Forward declarations */ @@ -63,7 +69,6 @@ struct _PurpleConversation; struct _PurpleGroup; struct _PurpleMessage; struct _PurpleNotifyUserInfo; -struct _PurplePluginAction; struct _PurpleRoomlist; struct _PurpleStatus; struct _PurpleXfer; diff --git a/src/purple/purple-search.c b/src/purple/purple-search.c index d65e3b48..7c8e1331 100644 --- a/src/purple/purple-search.c +++ b/src/purple/purple-search.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2015 SIPE Project + * Copyright (C) 2011-2019 SIPE Project * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ #include "version.h" #if PURPLE_VERSION_CHECK(3,0,0) +#include "action.h" #include "conversations.h" #endif -- 2.11.4.GIT