pidgin/pidgin

Remove PurpleProtocolFactory->roomlist_new as no one is using it

2021-11-02, Gary Kramlich
e250a5b59c97
Parents f223b69f7da2
Children 2b4446ccebc9
Remove PurpleProtocolFactory->roomlist_new as no one is using it

Remove PurpleProtocolFactory->roomlist_new as no one is implementing it

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1116/
3 files changed, 4 insertions(+), 57 deletions(-)
  • +0 -17
    libpurple/purpleprotocolfactory.c
  • +0 -17
    libpurple/purpleprotocolfactory.h
  • +4 -23
    libpurple/roomlist.c
    • --- a/libpurple/purpleprotocolfactory.c Tue Nov 02 00:30:07 2021 -0500
    +++ b/libpurple/purpleprotocolfactory.c Tue Nov 02 00:39:00 2021 -0500
    @@ -53,23 +53,6 @@
    return NULL;
    }
    -PurpleRoomlist *
    -purple_protocol_factory_roomlist_new(PurpleProtocolFactory *factory,
    - PurpleAccount *account)
    -{
    - PurpleProtocolFactoryInterface *iface = NULL;
    -
    - g_return_val_if_fail(PURPLE_IS_PROTOCOL_FACTORY(factory), NULL);
    - g_return_val_if_fail(PURPLE_IS_ACCOUNT(account), NULL);
    -
    - iface = PURPLE_PROTOCOL_FACTORY_GET_IFACE(factory);
    - if(iface && iface->roomlist_new) {
    - return iface->roomlist_new(factory, account);
    - }
    -
    - return NULL;
    -}
    -
    PurpleWhiteboard *
    purple_protocol_factory_whiteboard_new(PurpleProtocolFactory *factory,
    PurpleAccount *account,
    --- a/libpurple/purpleprotocolfactory.h Tue Nov 02 00:30:07 2021 -0500
    +++ b/libpurple/purpleprotocolfactory.h Tue Nov 02 00:39:00 2021 -0500
    @@ -85,9 +85,6 @@
    PurpleAccount *account,
    const gchar *password);
    - PurpleRoomlist *(*roomlist_new)(PurpleProtocolFactory *factory,
    - PurpleAccount *account);
    -
    PurpleWhiteboard *(*whiteboard_new)(PurpleProtocolFactory *factory,
    PurpleAccount *account,
    const gchar *who,
    @@ -120,20 +117,6 @@
    PurpleAccount *account, const gchar *password);
    /**
    - * purple_protocol_factory_roomlist_new:
    - * @factory: The #PurpleProtocolFactory instance.
    - * @account: The #PurpleAccount to create a roomlist for.
    - *
    - * Creates a new protocol-specific #PurpleRoomlist subclass.
    - *
    - * Returns: (transfer full): The new #PurpleRoomlist subclass for @account.
    - *
    - * Since: 3.0.0
    - */
    -PurpleRoomlist *purple_protocol_factory_roomlist_new(PurpleProtocolFactory *factory,
    - PurpleAccount *account);
    -
    -/**
    * purple_protocol_factory_whiteboard_new:
    * @factory: The #PurpleProtocolFactory instance.
    * @account: The #PurpleAccount instance to create a whiteboard for.
    --- a/libpurple/roomlist.c Tue Nov 02 00:30:07 2021 -0500
    +++ b/libpurple/roomlist.c Tue Nov 02 00:39:00 2021 -0500
    @@ -349,29 +349,10 @@
    PurpleRoomlist *purple_roomlist_new(PurpleAccount *account)
    {
    - PurpleRoomlist *list;
    - PurpleProtocol *protocol;
    -
    - g_return_val_if_fail(PURPLE_IS_ACCOUNT(account), NULL);
    -
    - protocol = purple_account_get_protocol(account);
    -
    - g_return_val_if_fail(PURPLE_IS_PROTOCOL(protocol), NULL);
    -
    - if(PURPLE_IS_PROTOCOL_FACTORY(protocol)) {
    - list = purple_protocol_factory_roomlist_new(
    - PURPLE_PROTOCOL_FACTORY(protocol), account);
    - }
    - else {
    - list = g_object_new(PURPLE_TYPE_ROOMLIST,
    - "account", account,
    - NULL
    - );
    - }
    -
    - g_return_val_if_fail(list != NULL, NULL);
    -
    - return list;
    + return g_object_new(PURPLE_TYPE_ROOMLIST,
    + "account", account,
    + NULL
    + );
    }
    /**************************************************************************/