pidgin/pidgin

update bonjour to just use purple.h

2019-09-28, Gary Kramlich
4a5610d858ef
Parents e47fcffd061b
Children d508d5b5dd22
update bonjour to just use purple.h
15 files changed, 22 insertions(+), 46 deletions(-)
  • +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
  • +3 -2
    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
    • --- a/libpurple/protocols/bonjour/bonjour.c Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/bonjour.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/bonjour.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/bonjour_ft.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/buddy.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/buddy.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/dns_sd_proxy.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/dns_sd_proxy.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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,7 +20,9 @@
    #ifndef PURPLE_BONJOUR_DNS_SD_PROXY_H
    #define PURPLE_BONJOUR_DNS_SD_PROXY_H
    -#include <config.h>
    +#if HAVE_CONFIG_H
    +# include <config.h>
    +#endif /* HAVE_CONFIG_H */
    #ifndef _MSC_VER
    #include <stdint.h>
    --- a/libpurple/protocols/bonjour/jabber.c Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/jabber.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/jabber.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/mdns_avahi.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/mdns_common.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/mdns_dns_sd.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/mdns_types.h Sat Sep 28 03:28:30 2019 -0500
    @@ -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 Sat Sep 28 03:11:33 2019 -0500
    +++ b/libpurple/protocols/bonjour/parser.c Sat Sep 28 03:28:30 2019 -0500
    @@ -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) {