pidgin/pidgin

Remove some remnants of the old protocol get_actions interface.

20 months ago, Gary Kramlich
77df5b4ebc67
Parents 7c01d55a8aeb
Children ddd97cdcbefc
Remove some remnants of the old protocol get_actions interface.

I #if 0'd the finch parts for now as we need build gnt menus from gmenu and
stuff.

Testing Done:
Ran and verified the XMPP account actions still showed up in the accounts menu.

Reviewed at https://reviews.imfreedom.org/r/1752/
4 files changed, 6 insertions(+), 42 deletions(-)
  • +6 -0
    finch/gntblist.c
  • +0 -1
    libpurple/protocols/jabber/jabber.c
  • +0 -17
    libpurple/purpleprotocolclient.c
  • +0 -24
    libpurple/purpleprotocolclient.h
    • --- a/finch/gntblist.c Mon Sep 12 22:00:09 2022 -0500
    +++ b/finch/gntblist.c Mon Sep 12 22:03:27 2022 -0500
    @@ -2271,6 +2271,8 @@
    build_protocol_actions(GntMenuItem *item, PurpleProtocol *protocol,
    PurpleConnection *gc)
    {
    + /* TODO: port to PurpleProtocolActions. */
    +#if 0
    GntWidget *sub = gnt_menu_new(GNT_MENU_POPUP);
    GList *actions;
    GntMenuItem *menuitem;
    @@ -2289,6 +2291,7 @@
    action, (GDestroyNotify)purple_protocol_action_free);
    }
    }
    +#endif
    }
    static gboolean
    @@ -2407,11 +2410,14 @@
    continue;
    protocol = purple_connection_get_protocol(gc);
    +#if 0
    + /* TODO: port to PurpleProtocolActions */
    if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, CLIENT, get_actions)) {
    item = gnt_menuitem_new(purple_account_get_username(account));
    gnt_menu_add_item(GNT_MENU(sub), item);
    build_protocol_actions(item, protocol, gc);
    }
    +#endif
    }
    }
    --- a/libpurple/protocols/jabber/jabber.c Mon Sep 12 22:00:09 2022 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Mon Sep 12 22:03:27 2022 -0500
    @@ -3884,7 +3884,6 @@
    static void
    jabber_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    - client_iface->get_actions = jabber_get_actions;
    client_iface->list_emblem = jabber_list_emblem;
    client_iface->status_text = jabber_status_text;
    client_iface->tooltip_text = jabber_tooltip_text;
    --- a/libpurple/purpleprotocolclient.c Mon Sep 12 22:00:09 2022 -0500
    +++ b/libpurple/purpleprotocolclient.c Mon Sep 12 22:03:27 2022 -0500
    @@ -35,23 +35,6 @@
    /******************************************************************************
    * Public API
    *****************************************************************************/
    -GList *
    -purple_protocol_client_get_actions(PurpleProtocolClient *client,
    - PurpleConnection *connection)
    -{
    - PurpleProtocolClientInterface *iface = NULL;
    -
    - g_return_val_if_fail(PURPLE_IS_PROTOCOL_CLIENT(client), NULL);
    - g_return_val_if_fail(PURPLE_IS_CONNECTION(connection), NULL);
    -
    - iface = PURPLE_PROTOCOL_CLIENT_GET_IFACE(client);
    - if(iface != NULL && iface->get_actions != NULL) {
    - return iface->get_actions(client, connection);
    - }
    -
    - return NULL;
    -}
    -
    const gchar *
    purple_protocol_client_list_emblem(PurpleProtocolClient *client,
    PurpleBuddy *buddy)
    --- a/libpurple/purpleprotocolclient.h Mon Sep 12 22:00:09 2022 -0500
    +++ b/libpurple/purpleprotocolclient.h Mon Sep 12 22:03:27 2022 -0500
    @@ -39,14 +39,6 @@
    PROTOCOL_CLIENT, PurpleProtocol)
    /**
    - * PURPLE_TYPE_PROTOCOL_CLIENT:
    - *
    - * The standard _get_type method for #PurpleProtocolClient.
    - *
    - * Since: 3.0.0
    - */
    -
    -/**
    * PurpleProtocolClient:
    *
    * #PurpleProtocolClient interface defines the behavior of a typical chat
    @@ -126,8 +118,6 @@
    GTypeInterface parent;
    /*< public >*/
    - GList *(*get_actions)(PurpleProtocolClient *client, PurpleConnection *connection);
    -
    const gchar *(*list_emblem)(PurpleProtocolClient *client, PurpleBuddy *buddy);
    gchar *(*status_text)(PurpleProtocolClient *client, PurpleBuddy *buddy);
    @@ -160,20 +150,6 @@
    G_BEGIN_DECLS
    /**
    - * purple_protocol_client_get_actions:
    - * @client: The #PurpleProtocolClient instance.
    - * @connection: The #PurpleConnection instance.
    - *
    - * Gets a list of actions for @connection.
    - *
    - * Returns: (transfer full) (element-type PurpleProtocolAction): The list of
    - * actions for @connection.
    - *
    - * Since: 3.0.0
    - */
    -GList *purple_protocol_client_get_actions(PurpleProtocolClient *client, PurpleConnection *connection);
    -
    -/**
    * purple_protocol_client_list_emblem:
    * @client: The #PurpleProtocolClient instance.
    * @buddy: The #PurpleBuddy instance.