pidgin/pidgin

Merged in default (pull request #574)

2019-10-09, Gary Kramlich
55a4770cddf7
Parents ab8660547d345c43ee682be6
Children 925f12595750
Merged in default (pull request #574)

start migrating plugins to purple.h

Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb
45 files changed, 120 insertions(+), 259 deletions(-)
  • +1 -10
    libpurple/plugins/autoaccept.c
  • +1 -6
    libpurple/plugins/buddynote.c
  • +2 -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
  • +1 -7
    libpurple/protocols/bonjour/bonjour.c
  • +1 -1
    libpurple/protocols/bonjour/bonjour.h
  • +2 -6
    libpurple/protocols/bonjour/bonjour_ft.c
  • +1 -2
    libpurple/protocols/bonjour/bonjour_ft.h
  • +2 -3
    libpurple/protocols/bonjour/buddy.c
  • +2 -1
    libpurple/protocols/bonjour/buddy.h
  • +2 -1
    libpurple/protocols/bonjour/dns_sd_proxy.c
  • +0 -3
    libpurple/protocols/bonjour/dns_sd_proxy.h
  • +1 -10
    libpurple/protocols/bonjour/jabber.c
  • +1 -4
    libpurple/protocols/bonjour/jabber.h
  • +1 -1
    libpurple/protocols/bonjour/mdns_avahi.c
  • +1 -1
    libpurple/protocols/bonjour/mdns_common.c
  • +1 -2
    libpurple/protocols/bonjour/mdns_dns_sd.c
  • +2 -1
    libpurple/protocols/bonjour/mdns_types.h
  • +1 -4
    libpurple/protocols/bonjour/parser.c
  • +1 -7
    libpurple/protocols/irc/cmds.c
  • +2 -6
    libpurple/protocols/irc/dcc_send.c
  • +1 -15
    libpurple/protocols/irc/irc.c
  • +1 -6
    libpurple/protocols/irc/irc.h
  • +1 -7
    libpurple/protocols/irc/msgs.c
  • +1 -8
    libpurple/protocols/irc/parse.c
  • +3 -3
    libpurple/protocols/simple/ntlm.c
  • +2 -1
    libpurple/protocols/simple/ntlm.h
  • +1 -15
    libpurple/protocols/simple/simple.c
  • +1 -6
    libpurple/protocols/simple/simple.h
  • +1 -12
    libpurple/protocols/simple/sipmsg.c
  • +0 -2
    libpurple/protocols/simple/sipmsg.h
    • --- a/libpurple/plugins/autoaccept.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/autoaccept.c Wed Oct 09 02:04:00 2019 +0000
    @@ -31,16 +31,7 @@
    #include <glib.h>
    #include <glib/gstdio.h>
    -/* Purple headers */
    -#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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/buddynote.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/codeinline.c Wed Oct 09 02:04:00 2019 +0000
    @@ -21,10 +21,8 @@
    */
    #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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/filectl.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/idle.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/joinpart.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/keyrings/internalkeyring.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/keyrings/secretservice.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/keyrings/wincred.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/log_reader.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/offlinemsg.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/one_time_password.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/psychic.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/signals-test.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/simple.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/statenotify.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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 Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/plugins/test-request-input.c Wed Oct 09 02:04:00 2019 +0000
    @@ -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"
    --- a/libpurple/protocols/bonjour/bonjour.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/bonjour.c Wed Oct 09 02:04:00 2019 +0000
    @@ -31,13 +31,7 @@
    #endif
    #include "internal.h"
    -
    -#include "account.h"
    -#include "accountopt.h"
    -#include "debug.h"
    -#include "plugins.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "bonjour.h"
    #include "mdns_common.h"
    --- a/libpurple/protocols/bonjour/bonjour.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/bonjour.h Wed Oct 09 02:04:00 2019 +0000
    @@ -29,7 +29,7 @@
    #include <gmodule.h>
    #include "internal.h"
    -#include "protocol.h"
    +#include <purple.h>
    #include "mdns_common.h"
    #include "jabber.h"
    --- a/libpurple/protocols/bonjour/bonjour_ft.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Wed Oct 09 02:04:00 2019 +0000
    @@ -20,12 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    #include "internal.h"
    -#include "util.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "proxy.h"
    -#include "xfer.h"
    -#include "buddy.h"
    +#include <purple.h>
    +
    #include "bonjour.h"
    #include "bonjour_ft.h"
    --- a/libpurple/protocols/bonjour/bonjour_ft.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/bonjour_ft.h Wed Oct 09 02:04:00 2019 +0000
    @@ -22,8 +22,7 @@
    #ifndef PURPLE_BONJOUR_BONJOUR_FT_H
    #define PURPLE_BONJOUR_BONJOUR_FT_H
    -#include "network.h"
    -#include "proxy.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/libpurple/protocols/bonjour/buddy.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/buddy.c Wed Oct 09 02:04:00 2019 +0000
    @@ -18,12 +18,11 @@
    #include <stdlib.h>
    #include "internal.h"
    +#include <purple.h>
    +
    #include "buddy.h"
    -#include "account.h"
    -#include "buddylist.h"
    #include "bonjour.h"
    #include "mdns_interface.h"
    -#include "debug.h"
    /**
    * Creates a new buddy.
    --- a/libpurple/protocols/bonjour/buddy.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/buddy.h Wed Oct 09 02:04:00 2019 +0000
    @@ -19,7 +19,8 @@
    #include <glib.h>
    -#include "account.h"
    +#include <purple.h>
    +
    #include "jabber.h"
    typedef struct
    --- a/libpurple/protocols/bonjour/dns_sd_proxy.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/dns_sd_proxy.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,5 +1,4 @@
    /*
    - *
    * Purple is the legal property of its developers, whose names are too numerous
    * to list here. Please refer to the COPYRIGHT file distributed with this
    * source distribution.
    @@ -20,6 +19,8 @@
    */
    #include "internal.h"
    +#include <purple.h>
    +
    #include "dns_sd_proxy.h"
    static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
    --- a/libpurple/protocols/bonjour/dns_sd_proxy.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/dns_sd_proxy.h Wed Oct 09 02:04:00 2019 +0000
    @@ -1,5 +1,4 @@
    /*
    - *
    * Purple is the legal property of its developers, whose names are too numerous
    * to list here. Please refer to the COPYRIGHT file distributed with this
    * source distribution.
    @@ -21,8 +20,6 @@
    #ifndef PURPLE_BONJOUR_DNS_SD_PROXY_H
    #define PURPLE_BONJOUR_DNS_SD_PROXY_H
    -#include <config.h>
    -
    #ifndef _MSC_VER
    #include <stdint.h>
    #endif
    --- a/libpurple/protocols/bonjour/jabber.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/jabber.c Wed Oct 09 02:04:00 2019 +0000
    @@ -21,6 +21,7 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #ifndef _WIN32
    #include <net/if.h>
    @@ -46,16 +47,6 @@
    #include <ifaddrs.h>
    #endif
    -#include "buddylist.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "eventloop.h"
    -#include "network.h"
    -#include "notify.h"
    -#include "purple-gio.h"
    -#include "util.h"
    -#include "xmlnode.h"
    -
    #include "jabber.h"
    #include "parser.h"
    #include "bonjour.h"
    --- a/libpurple/protocols/bonjour/jabber.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/jabber.h Wed Oct 09 02:04:00 2019 +0000
    @@ -28,10 +28,7 @@
    #include <libxml/parser.h>
    -#include "xmlnode.h"
    -
    -#include "account.h"
    -#include "circularbuffer.h"
    +#include <purple.h>
    typedef struct
    {
    --- a/libpurple/protocols/bonjour/mdns_avahi.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/mdns_avahi.c Wed Oct 09 02:04:00 2019 +0000
    @@ -15,9 +15,9 @@
    */
    #include "internal.h"
    +#include <purple.h>
    #include "mdns_interface.h"
    -#include "debug.h"
    #include "buddy.h"
    #include "bonjour.h"
    --- a/libpurple/protocols/bonjour/mdns_common.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/mdns_common.c Wed Oct 09 02:04:00 2019 +0000
    @@ -17,7 +17,7 @@
    #include <string.h>
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "mdns_common.h"
    #include "mdns_interface.h"
    --- a/libpurple/protocols/bonjour/mdns_dns_sd.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/mdns_dns_sd.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,5 +1,4 @@
    /*
    - *
    * Purple is the legal property of its developers, whose names are too numerous
    * to list here. Please refer to the COPYRIGHT file distributed with this
    * source distribution.
    @@ -20,7 +19,7 @@
    */
    #include "internal.h"
    -#include "debug.h"
    +#include <purple.h>
    #include "buddy.h"
    #include "mdns_interface.h"
    --- a/libpurple/protocols/bonjour/mdns_types.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/mdns_types.h Wed Oct 09 02:04:00 2019 +0000
    @@ -18,7 +18,8 @@
    #define PURPLE_BONJOUR_MDNS_TYPES_H
    #include <glib.h>
    -#include "account.h"
    +
    +#include <purple.h>
    #define LINK_LOCAL_RECORD_NAME "_presence._tcp."
    --- a/libpurple/protocols/bonjour/parser.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/bonjour/parser.c Wed Oct 09 02:04:00 2019 +0000
    @@ -21,15 +21,12 @@
    *
    */
    #include "internal.h"
    +#include <purple.h>
    #include <libxml/parser.h>
    -#include "connection.h"
    -#include "debug.h"
    #include "jabber.h"
    #include "parser.h"
    -#include "util.h"
    -#include "xmlnode.h"
    static gboolean
    parse_from_attrib_and_find_buddy(BonjourJabberConversation *bconv, int nb_attributes, const xmlChar **attributes) {
    --- a/libpurple/protocols/irc/cmds.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/cmds.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file cmds.c
    - *
    * purple
    *
    * Copyright (C) 2003, Ethan Blanton <eblanton@cs.purdue.edu>
    @@ -21,11 +19,7 @@
    */
    #include "internal.h"
    -
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "util.h"
    +#include <purple.h>
    #include "irc.h"
    --- a/libpurple/protocols/irc/dcc_send.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/dcc_send.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file dcc_send.c Functions used in sending files with DCC SEND
    - *
    * purple
    *
    * Copyright (C) 2004, Timothy T Ringenbach <omarvo@hotmail.com>
    @@ -22,11 +20,9 @@
    */
    #include "internal.h"
    +#include <purple.h>
    +
    #include "irc.h"
    -#include "debug.h"
    -#include "xfer.h"
    -#include "notify.h"
    -#include "network.h"
    struct _IrcXfer {
    PurpleXfer parent;
    --- a/libpurple/protocols/irc/irc.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/irc.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file irc.c
    - *
    * purple
    *
    * Copyright (C) 2003, Robbert Haarman <purple@inglorion.net>
    @@ -24,19 +22,7 @@
    */
    #include "internal.h"
    -
    -#include "accountopt.h"
    -#include "action.h"
    -#include "buddylist.h"
    -#include "conversation.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "plugins.h"
    -#include "purple-gio.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "irc.h"
    --- a/libpurple/protocols/irc/irc.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/irc.h Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file irc.h
    - *
    * purple
    *
    * Copyright (C) 2003, 2012 Ethan Blanton <elb@pidgin.im>
    @@ -30,10 +28,7 @@
    #include <sasl/sasl.h>
    #endif
    -#include "circularbuffer.h"
    -#include "xfer.h"
    -#include "queuedoutputstream.h"
    -#include "roomlist.h"
    +#include <purple.h>
    #define IRC_TYPE_PROTOCOL (irc_protocol_get_type())
    #define IRC_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), IRC_TYPE_PROTOCOL, IRCProtocol))
    --- a/libpurple/protocols/irc/msgs.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/msgs.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file msgs.c
    - *
    * purple
    *
    * Copyright (C) 2003, 2012 Ethan Blanton <elb@pidgin.im>
    @@ -27,12 +25,8 @@
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "conversation.h"
    -#include "buddylist.h"
    -#include "notify.h"
    -#include "util.h"
    -#include "debug.h"
    #include "irc.h"
    #include <stdio.h>
    --- a/libpurple/protocols/irc/parse.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/irc/parse.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file parse.c
    - *
    * purple
    *
    * Copyright (C) 2003, Ethan Blanton <eblanton@cs.purdue.edu>
    @@ -21,13 +19,8 @@
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "accountopt.h"
    -#include "conversation.h"
    -#include "notify.h"
    -#include "debug.h"
    -#include "util.h"
    -#include "cmds.h"
    #include "irc.h"
    #include <stdio.h>
    --- a/libpurple/protocols/simple/ntlm.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/ntlm.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,4 +1,5 @@
    -/* purple
    +/*
    + * purple
    *
    * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
    *
    @@ -21,10 +22,9 @@
    */
    #include "internal.h"
    +#include <purple.h>
    -#include "util.h"
    #include "ntlm.h"
    -#include "debug.h"
    #ifdef HAVE_NETTLE
    #include <nettle/des.h>
    --- a/libpurple/protocols/simple/ntlm.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/ntlm.h Wed Oct 09 02:04:00 2019 +0000
    @@ -1,4 +1,5 @@
    -/* purple
    +/*
    + * purple
    *
    * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
    *
    --- a/libpurple/protocols/simple/simple.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/simple.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file simple.c
    - *
    * purple
    *
    * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
    @@ -25,19 +23,7 @@
    */
    #include "internal.h"
    -
    -#include "accountopt.h"
    -#include "buddylist.h"
    -#include "conversation.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "plugins.h"
    -#include "util.h"
    -#include "version.h"
    -#include "network.h"
    -#include "xmlnode.h"
    +#include <purple.h>
    #include "simple.h"
    #include "sipmsg.h"
    --- a/libpurple/protocols/simple/simple.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/simple.h Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file simple.h
    - *
    * purple
    *
    * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
    @@ -28,10 +26,7 @@
    #include <gio/gio.h>
    #include <time.h>
    -#include "circularbuffer.h"
    -#include "network.h"
    -#include "proxy.h"
    -#include "protocol.h"
    +#include <purple.h>
    #include "sipmsg.h"
    --- a/libpurple/protocols/simple/sipmsg.c Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/sipmsg.c Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file sipmsg.c
    - *
    * purple
    *
    * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
    @@ -21,16 +19,7 @@
    */
    #include "internal.h"
    -
    -#include "accountopt.h"
    -#include "buddylist.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "plugins.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "simple.h"
    #include "sipmsg.h"
    --- a/libpurple/protocols/simple/sipmsg.h Wed Oct 09 02:02:56 2019 +0000
    +++ b/libpurple/protocols/simple/sipmsg.h Wed Oct 09 02:04:00 2019 +0000
    @@ -1,6 +1,4 @@
    /**
    - * @file sipmsg.h
    - *
    * purple
    *
    * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>