HGKeeper

pidgin/pidgin

migrate the libpurple plugins to using purple.h only

2019-09-28, Gary Kramlich

e47fcffd061b

Parents 1788230a5ef3
Children 4a5610d858ef

migrate the libpurple plugins to using purple.h only

18 files changed, 89 insertions(+), 120 deletions(-)

+1 -6

libpurple/plugins/autoaccept.c

+1 -6

libpurple/plugins/buddynote.c

+5 -4

libpurple/plugins/codeinline.c

+1 -8

libpurple/plugins/filectl.c

+1 -9

libpurple/plugins/idle.c

+1 -4

libpurple/plugins/joinpart.c

+1 -5

libpurple/plugins/keyrings/internalkeyring.c

+1 -5

libpurple/plugins/keyrings/kwallet/purplekwallet.cpp

+1 -5

libpurple/plugins/keyrings/secretservice.c

+1 -4

libpurple/plugins/keyrings/wincred.c

+18 -10

libpurple/plugins/log_reader.c

+1 -9

libpurple/plugins/offlinemsg.c

+1 -5

libpurple/plugins/one_time_password.c

+17 -14

libpurple/plugins/psychic.c

+1 -10

libpurple/plugins/signals-test.c

+18 -3

libpurple/plugins/simple.c

+18 -10

libpurple/plugins/statenotify.c

+1 -3

libpurple/plugins/test-request-input.c

~~--- a/libpurple/plugins/autoaccept.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/autoaccept.c Sat Sep 28 03:11:33 2019 -0500

@@ -35,12 +35,7 @@

#include <plugins.h>

#include <version.h>

~~-#include <action.h>~~

~~-#include <buddylist.h>~~

~~-#include <conversation.h>~~

~~-#include <xfer.h>~~

~~-#include <request.h>~~

~~-#include <notify.h>~~

+#include <purple.h>

#define PREF_PREFIX "/plugins/core/" PLUGIN_ID

#define PREF_PATH PREF_PREFIX "/path"

~~--- a/libpurple/plugins/buddynote.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/buddynote.c Sat Sep 28 03:11:33 2019 -0500

@@ -18,12 +18,7 @@

#include "internal.h"

~~-#include <action.h>~~

~~-#include <debug.h>~~

~~-#include <notify.h>~~

~~-#include <request.h>~~

~~-#include <signals.h>~~

~~-#include <version.h>~~

+#include <purple.h>

static void

dont_do_it_cb(PurpleBlistNode *node, const char *note)

~~--- a/libpurple/plugins/codeinline.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/codeinline.c Sat Sep 28 03:11:33 2019 -0500

@@ -20,11 +20,12 @@

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

+/* When writing a third-party plugin, do not include libpurple's internal.h

+ * included below. This file is for internal libpurple use only. We're including

+ * it here for our own convenience. */

#include "internal.h"

~~-#include "plugins.h"~~

~~-#include "notify.h"~~

~~-#include "util.h"~~

~~-#include "version.h"~~

+#include <purple.h>

PurplePlugin *plugin_handle = NULL;

~~--- a/libpurple/plugins/filectl.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/filectl.c Sat Sep 28 03:11:33 2019 -0500

@@ -16,14 +16,7 @@

#include <ctype.h>

#include "internal.h"

~~-#include "account.h"~~

~~-#include "config.h"~~

~~-#include "core.h"~~

~~-#include "conversation.h"~~

~~-#include "debug.h"~~

~~-#include "eventloop.h"~~

~~-#include "util.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#define FILECTL_PLUGIN_ID "core-filectl"

static int check;

~~--- a/libpurple/plugins/idle.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/idle.c Sat Sep 28 03:11:33 2019 -0500

@@ -24,15 +24,7 @@

#include "internal.h"

~~-#include "connection.h"~~

~~-#include "debug.h"~~

~~-#include "notify.h"~~

~~-#include "plugins.h"~~

~~-#include "presence.h"~~

~~-#include "request.h"~~

~~-#include "server.h"~~

~~-#include "status.h"~~

~~-#include "version.h"~~

+#include <purple.h>

/* This plugin no longer depends on gtk */

#define IDLE_PLUGIN_ID "core-idle"

~~--- a/libpurple/plugins/joinpart.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/joinpart.c Sat Sep 28 03:11:33 2019 -0500

@@ -21,10 +21,7 @@

#include "internal.h"

~~-#include "conversation.h"~~

~~-#include "debug.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#define JOINPART_PLUGIN_ID "core-rlaager-joinpart"

~~--- a/libpurple/plugins/keyrings/internalkeyring.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/keyrings/internalkeyring.c Sat Sep 28 03:11:33 2019 -0500

@@ -25,11 +25,7 @@

#include "internal.h"

~~-#include "account.h"~~

~~-#include "debug.h"~~

~~-#include "keyring.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#include <nettle/aes.h>

#include <nettle/cbc.h>

~~--- a/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Sat Sep 28 03:11:33 2019 -0500

@@ -25,11 +25,7 @@

#include "internal.h"

~~-#include "account.h"~~

~~-#include "core.h"~~

~~-#include "debug.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#include <QQueue>

#include <QCoreApplication>

~~--- a/libpurple/plugins/keyrings/secretservice.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/keyrings/secretservice.c Sat Sep 28 03:11:33 2019 -0500

@@ -33,11 +33,7 @@

#include "internal.h"

~~-#include "account.h"~~

~~-#include "debug.h"~~

~~-#include "keyring.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#include <libsecret/secret.h>

~~--- a/libpurple/plugins/keyrings/wincred.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/keyrings/wincred.c Sat Sep 28 03:11:33 2019 -0500

@@ -25,10 +25,7 @@

#include "internal.h"

~~-#include "debug.h"~~

~~-#include "keyring.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#include <wincred.h>

~~--- a/libpurple/plugins/log_reader.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/log_reader.c Sat Sep 28 03:11:33 2019 -0500

@@ -1,17 +1,25 @@

+/*

+ * 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 the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * 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 <stdio.h>

~~-#include "debug.h"~~

~~-#include "glibcompat.h"~~

~~-#include "log.h"~~

~~-#include "plugins.h"~~

~~-#include "pluginpref.h"~~

~~-#include "prefs.h"~~

~~-#include "stringref.h"~~

~~-#include "util.h"~~

~~-#include "version.h"~~

~~-#include "xmlnode.h"~~

+#include <purple.h>

/* Where is the Windows partition mounted? */

#ifndef PURPLE_LOG_READER_WINDOWS_MOUNT_POINT

~~--- a/libpurple/plugins/offlinemsg.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/offlinemsg.c Sat Sep 28 03:11:33 2019 -0500

@@ -27,15 +27,7 @@

#define PLUGIN_DESCRIPTION N_("Save messages sent to an offline user as pounce.")

#define PLUGIN_AUTHORS {"Sadrul H Chowdhury <sadrul@users.sourceforge.net>", NULL}

~~-/* Purple headers */~~

~~-#include <version.h>~~

~~-#include <buddylist.h>~~

~~-#include <conversation.h>~~

~~-#include <core.h>~~

~~-#include <debug.h>~~

~~-#include <pounce.h>~~

~~-#include <request.h>~~

+#include <purple.h>

#define PREF_PREFIX "/plugins/core/" PLUGIN_ID

#define PREF_ALWAYS PREF_PREFIX "/always"

~~--- a/libpurple/plugins/one_time_password.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/one_time_password.c Sat Sep 28 03:11:33 2019 -0500

@@ -19,11 +19,7 @@

* 02111-1301, USA.

#include "internal.h"

~~-#include "debug.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

~~-#include "account.h"~~

~~-#include "accountopt.h"~~

+#include <purple.h>

#define PLUGIN_ID "core-one_time_password"

#define PREF_NAME PLUGIN_ID "_enabled"

~~--- a/libpurple/plugins/psychic.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/psychic.c Sat Sep 28 03:11:33 2019 -0500

@@ -1,19 +1,22 @@

+/*

+ * 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 the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * 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 "buddylist.h"~~

~~-#include "conversation.h"~~

~~-#include "debug.h"~~

~~-#include "signals.h"~~

~~-#include "status.h"~~

~~-#include "version.h"~~

~~-#include "plugins.h"~~

~~-#include "pluginpref.h"~~

~~-#include "prefs.h"~~

+#include <purple.h>

#define PLUGIN_ID "core-psychic"

#define PLUGIN_NAME N_("Psychic Mode")

~~--- a/libpurple/plugins/signals-test.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/signals-test.c Sat Sep 28 03:11:33 2019 -0500

@@ -21,19 +21,10 @@

#define SIGNAL_TEST_PLUGIN_ID "core-signals-test"

#include "internal.h"

+#include <purple.h>

#include <stdio.h>

~~-#include "connection.h"~~

~~-#include "conversation.h"~~

~~-#include "core.h"~~

~~-#include "debug.h"~~

~~-#include "xfer.h"~~

~~-#include "signals.h"~~

~~-#include "version.h"~~

~~-#include "status.h"~~

~~-#include "sound.h"~~

/**************************************************************************

* Account subsystem signal callbacks

**************************************************************************/

~~--- a/libpurple/plugins/simple.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/simple.c Sat Sep 28 03:11:33 2019 -0500

@@ -1,7 +1,22 @@

+/*

+ * 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 the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * 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 "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

/** Plugin id : type-author-name (to guarantee uniqueness) */

#define SIMPLE_PLUGIN_ID "core-ewarmenhoven-simple"

~~--- a/libpurple/plugins/statenotify.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/statenotify.c Sat Sep 28 03:11:33 2019 -0500

@@ -1,14 +1,22 @@

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

+/*

+ * 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 the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

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

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

+ * 02111-1301, USA.

+ */

~~-#include "buddylist.h"~~

~~-#include "conversation.h"~~

~~-#include "debug.h"~~

~~-#include "signals.h"~~

~~-#include "version.h"~~

~~-#include "plugins.h"~~

~~-#include "pluginpref.h"~~

~~-#include "prefs.h"~~

+#include "internal.h"

+#include <purple.h>

#define STATENOTIFY_PLUGIN_ID "core-statenotify"

~~--- a/libpurple/plugins/test-request-input.c Fri Oct 04 03:46:50 2019 +0000~~

+++ b/libpurple/plugins/test-request-input.c Sat Sep 28 03:11:33 2019 -0500

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

#include <glib.h>

#include "internal.h"

~~-#include "notify.h"~~

~~-#include "plugins.h"~~

~~-#include "version.h"~~

+#include <purple.h>

#define PREF_ROOT "/plugins"

#define PREF_TEST "/plugins/tests"