--- 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 + ); } /**************************************************************************/