pidgin/pidgin

Use GPtrArray in PurpleProtocolManager

19 months ago, Elliott Sales de Andrade
acd605927a16
Parents 4289b30044ed
Children f25917ae8556
Use GPtrArray in PurpleProtocolManager

This is probably a bit easier to understand than `GArray`.

Testing Done:
Compiled and checked Protocol chooser in Add Account seemed to have stuff in it.

Reviewed at https://reviews.imfreedom.org/r/1794/
1 files changed, 11 insertions(+), 11 deletions(-)
  • +11 -11
    libpurple/purpleprotocolmanager.c
    • --- a/libpurple/purpleprotocolmanager.c Sun Sep 18 22:49:16 2022 -0500
    +++ b/libpurple/purpleprotocolmanager.c Mon Sep 19 02:04:30 2022 -0500
    @@ -32,7 +32,7 @@
    GObject parent;
    GHashTable *protocols;
    - GArray *list;
    + GPtrArray *list;
    };
    static PurpleProtocolManager *default_manager = NULL;
    @@ -57,7 +57,9 @@
    PurpleProtocolManager *manager = PURPLE_PROTOCOL_MANAGER(list);
    PurpleProtocol *protocol = NULL;
    - protocol = g_array_index(manager->list, PurpleProtocol *, position);
    + if(position < manager->list->len) {
    + protocol = g_ptr_array_index(manager->list, position);
    + }
    return g_object_ref(protocol);
    }
    @@ -83,7 +85,7 @@
    manager = PURPLE_PROTOCOL_MANAGER(obj);
    g_clear_pointer(&manager->protocols, g_hash_table_destroy);
    - g_clear_pointer(&manager->list, g_array_unref);
    + g_clear_pointer(&manager->list, g_ptr_array_unref);
    G_OBJECT_CLASS(purple_protocol_manager_parent_class)->finalize(obj);
    }
    @@ -92,7 +94,7 @@
    purple_protocol_manager_init(PurpleProtocolManager *manager) {
    manager->protocols = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
    g_object_unref);
    - manager->list = g_array_new(FALSE, FALSE, sizeof(PurpleProtocol *));
    + manager->list = g_ptr_array_new();
    }
    static void
    @@ -186,7 +188,7 @@
    g_hash_table_insert(manager->protocols, g_strdup(id),
    g_object_ref(protocol));
    - g_array_append_val(manager->list, protocol);
    + g_ptr_array_add(manager->list, protocol);
    g_list_model_items_changed(G_LIST_MODEL(manager), manager->list->len - 1, 0, 1);
    g_signal_emit(G_OBJECT(manager), signals[SIG_REGISTERED], 0, protocol);
    @@ -214,12 +216,10 @@
    id = purple_protocol_get_id(protocol);
    if(g_hash_table_remove(manager->protocols, id)) {
    - for(guint i = 0; i < manager->list->len; i++) {
    - if(g_array_index(manager->list, PurpleProtocol *, i) == protocol) {
    - g_array_remove_index(manager->list, i);
    - g_list_model_items_changed(G_LIST_MODEL(manager), i, 1, 0);
    - break;
    - }
    + guint position;
    + if(g_ptr_array_find(manager->list, protocol, &position)) {
    + g_ptr_array_remove_index(manager->list, position);
    + g_list_model_items_changed(G_LIST_MODEL(manager), position, 1, 0);
    }
    g_signal_emit(G_OBJECT(manager), signals[SIG_UNREGISTERED], 0,