pidgin/pidgin

Get the null prpl working again and build it by default but don't install it

2019-09-28, Gary Kramlich
4bc87b3dbca4
Parents 807fde3a9079
Children 9836a62b586d
Get the null prpl working again and build it by default but don't install it
4 files changed, 12 insertions(+), 23 deletions(-)
  • +1 -1
    libpurple/protocols/null/meson.build
  • +7 -19
    libpurple/protocols/null/nullprpl.c
  • +3 -2
    libpurple/protocols/null/nullprpl.h
  • +1 -1
    meson.build
    • --- a/libpurple/protocols/null/meson.build Sat Sep 28 05:12:48 2019 +0000
    +++ b/libpurple/protocols/null/meson.build Sat Sep 28 03:53:56 2019 -0500
    @@ -7,5 +7,5 @@
    if DYNAMIC_NULL
    null_prpl = shared_library('null', NULLSOURCES,
    dependencies : [libpurple_dep, glib],
    - install : true, install_dir : PURPLE_PLUGINDIR)
    + install : false, install_dir : PURPLE_PLUGINDIR)
    endif
    --- a/libpurple/protocols/null/nullprpl.c Sat Sep 28 05:12:48 2019 +0000
    +++ b/libpurple/protocols/null/nullprpl.c Sat Sep 28 03:53:56 2019 -0500
    @@ -51,23 +51,10 @@
    * it with code to include your own config.h or similar. If you're going to
    * provide for translation, you'll also need to setup the gettext macros. */
    #include "internal.h"
    +#include <purple.h>
    #include "nullprpl.h"
    -#include "account.h"
    -#include "accountopt.h"
    -#include "buddylist.h"
    -#include "cmds.h"
    -#include "conversation.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "plugins.h"
    -#include "roomlist.h"
    -#include "status.h"
    -#include "util.h"
    -#include "version.h"
    -
    /*
    * reference to the protocol instance, used for registering signals, prefs,
    * etc. it is set when the protocol is added in plugin_load and is required
    @@ -855,10 +842,10 @@
    }
    static void null_set_buddy_icon(PurpleConnection *gc,
    - PurpleStoredImage *img) {
    + PurpleImage *img) {
    purple_debug_info("nullprpl", "setting %s's buddy icon to %s\n",
    purple_account_get_username(purple_connection_get_account(gc)),
    - img ? purple_imgstore_get_filename(img) : "(null)");
    + img ? purple_image_get_path(img) : "(null)");
    }
    static void null_remove_group(PurpleConnection *gc, PurpleGroup *group) {
    @@ -975,10 +962,13 @@
    purple_roomlist_room_get_name(category));
    }
    +/* PurpleClientIface->offline_message takes a const PurpleBuddy *, this needs
    + * to change, but didn't want to do that in this pull request.
    + */
    static gboolean null_offline_message(const PurpleBuddy *buddy) {
    purple_debug_info("nullprpl",
    "reporting that offline messages are supported for %s\n",
    - purple_buddy_get_name(buddy));
    + purple_buddy_get_name((PurpleBuddy *)buddy));
    return TRUE;
    }
    @@ -1155,8 +1145,6 @@
    static gboolean
    plugin_load(PurplePlugin *plugin, GError **error)
    {
    - PurpleCmdId id;
    -
    /* register the NULL_TYPE_PROTOCOL type in the type system. this function
    * is defined by PURPLE_DEFINE_TYPE_EXTENDED. */
    null_protocol_register_type(plugin);
    --- a/libpurple/protocols/null/nullprpl.h Sat Sep 28 05:12:48 2019 +0000
    +++ b/libpurple/protocols/null/nullprpl.h Sat Sep 28 03:53:56 2019 -0500
    @@ -1,4 +1,5 @@
    -/* purple
    +/*
    + * purple
    *
    * 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
    @@ -23,7 +24,7 @@
    #ifndef PURPLE_NULL_NULLPRPL_H
    #define PURPLE_NULL_NULLPRPL_H
    -#include "protocol.h"
    +#include <purple.h>
    #define NULL_TYPE_PROTOCOL (null_protocol_get_type())
    #define NULL_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NULL_TYPE_PROTOCOL, NullProtocol))
    --- a/meson.build Sat Sep 28 05:12:48 2019 +0000
    +++ b/meson.build Sat Sep 28 03:53:56 2019 -0500
    @@ -536,7 +536,7 @@
    DEFAULT_PRPLS = ['bonjour', 'facebook', 'gg', 'irc', 'jabber', 'novell',
    - 'oscar', 'sametime', 'silc', 'simple', 'zephyr']
    + 'null', 'oscar', 'sametime', 'silc', 'simple', 'zephyr']
    ALL_PRPLS = DEFAULT_PRPLS + ['null']
    dynamic_list = get_option('dynamic-prpls').split(',')