pidgin/pidgin

Avoid manual handling of icons in request field list items

2021-04-05, Arkadiy Illarionov
b5eccef8404e
Avoid manual handling of icons in request field list items

* Use `PurpleKeyValuePair` as field list items
* Replace `icons` list with `has_icons` flag, thus fixing memleak
* Replace `purple_request_field_list_get_icons` with `purple_request_field_list_has_icons`

Testing Done:
Compile and run.

Reviewed at https://reviews.imfreedom.org/r/563/
/*
* Purple - Internet Messaging Library
* Copyright (C) Pidgin Developers <devel@pidgin.im>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include <glib/gi18n-lib.h>
#include "purpleprotocolmanager.h"
#include "purpleprivate.h"
enum {
SIG_REGISTERED,
SIG_UNREGISTERED,
N_SIGNALS,
};
static guint signals[N_SIGNALS] = {0, };
typedef struct {
GHashTable *protocols;
} PurpleProtocolManagerPrivate;
G_DEFINE_TYPE_WITH_PRIVATE(PurpleProtocolManager, purple_protocol_manager,
G_TYPE_OBJECT);
static PurpleProtocolManager *default_manager = NULL;
/******************************************************************************
* GObject Implementation
*****************************************************************************/
static void
purple_protocol_manager_finalize(GObject *obj) {
PurpleProtocolManager *manager = NULL;
PurpleProtocolManagerPrivate *priv = NULL;
manager = PURPLE_PROTOCOL_MANAGER(obj);
priv = purple_protocol_manager_get_instance_private(manager);
g_clear_pointer(&priv->protocols, g_hash_table_destroy);
G_OBJECT_CLASS(purple_protocol_manager_parent_class)->finalize(obj);
}
static void
purple_protocol_manager_init(PurpleProtocolManager *manager) {
PurpleProtocolManagerPrivate *priv = NULL;
priv = purple_protocol_manager_get_instance_private(manager);
priv->protocols = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
g_object_unref);
}
static void
purple_protocol_manager_class_init(PurpleProtocolManagerClass *klass) {
GObjectClass *obj_class = G_OBJECT_CLASS(klass);
obj_class->finalize = purple_protocol_manager_finalize;
/**
* PurpleProtocolManager::protocol-registered:
* @manager: The #PurpleProtocolManager instance.
* @protocol: The #PurpleProtocol that was registered.
*
* Emitted after @protocol has been registered in @manager.
*
* Since: 3.0.0
*/
signals[SIG_REGISTERED] = g_signal_new(
"registered",
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(PurpleProtocolManagerClass, registered),
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
PURPLE_TYPE_PROTOCOL);
/**
* PurpleProtocolManager::protocol-unregistered:
* @manager: The #PurpleProtocolManager instance.
* @protocol: The #PurpleProtocol that was unregistered.
*
* Emitted after @protocol has been unregistered from @manager.
*
* Since: 3.0.0
*/
signals[SIG_UNREGISTERED] = g_signal_new(
"unregistered",
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(PurpleProtocolManagerClass, unregistered),
NULL,
NULL,
NULL,
G_TYPE_NONE,
1,
PURPLE_TYPE_PROTOCOL);
}
/******************************************************************************
* Private API
*****************************************************************************/
void
purple_protocol_manager_startup(void) {
if(default_manager == NULL) {
default_manager = g_object_new(PURPLE_TYPE_PROTOCOL_MANAGER, NULL);
}
}
void
purple_protocol_manager_shutdown(void) {
g_clear_object(&default_manager);
}
/******************************************************************************
* Public API
*****************************************************************************/
PurpleProtocolManager *
purple_protocol_manager_get_default(void) {
return default_manager;
}
gboolean
purple_protocol_manager_register(PurpleProtocolManager *manager,
PurpleProtocol *protocol, GError **error)
{
PurpleProtocolManagerPrivate *priv = NULL;
const gchar *id = NULL;
g_return_val_if_fail(PURPLE_IS_PROTOCOL_MANAGER(manager), FALSE);
g_return_val_if_fail(PURPLE_IS_PROTOCOL(protocol), FALSE);
priv = purple_protocol_manager_get_instance_private(manager);
id = purple_protocol_get_id(protocol);
if(g_hash_table_lookup(priv->protocols, id) != NULL) {
g_set_error(error, PURPLE_PROTOCOL_MANAGER_DOMAIN, 0,
_("protocol %s is already registered"), id);
return FALSE;
}
g_hash_table_insert(priv->protocols, g_strdup(id), g_object_ref(protocol));
g_signal_emit(G_OBJECT(manager), signals[SIG_REGISTERED], 0, protocol);
return TRUE;
}
gboolean
purple_protocol_manager_unregister(PurpleProtocolManager *manager,
PurpleProtocol *protocol, GError **error)
{
PurpleProtocolManagerPrivate *priv = NULL;
const gchar *id = NULL;
gboolean ret = FALSE;
g_return_val_if_fail(PURPLE_IS_PROTOCOL_MANAGER(manager), FALSE);
g_return_val_if_fail(PURPLE_IS_PROTOCOL(protocol), FALSE);
/* We need to hold a reference on the protocol as typically we will be
* holding the only reference on the protocol when this is called and we
* will need to pass it to the signal emission after it's removed from the
* hash table that'll unref it.
*/
g_object_ref(G_OBJECT(protocol));
priv = purple_protocol_manager_get_instance_private(manager);
id = purple_protocol_get_id(protocol);
if(g_hash_table_remove(priv->protocols, id)) {
g_signal_emit(G_OBJECT(manager), signals[SIG_UNREGISTERED], 0,
protocol);
ret = TRUE;
} else {
g_set_error(error, PURPLE_PROTOCOL_MANAGER_DOMAIN, 0,
_("protocol %s is not registered"), id);
ret = FALSE;
}
g_object_unref(G_OBJECT(protocol));
return ret;
}
PurpleProtocol *
purple_protocol_manager_find(PurpleProtocolManager *manager, const gchar *id) {
PurpleProtocolManagerPrivate *priv = NULL;
gpointer value = NULL;
g_return_val_if_fail(PURPLE_IS_PROTOCOL_MANAGER(manager), NULL);
g_return_val_if_fail(id != NULL, NULL);
priv = purple_protocol_manager_get_instance_private(manager);
value = g_hash_table_lookup(priv->protocols, id);
if(value == NULL) {
return NULL;
}
return PURPLE_PROTOCOL(value);
}
GList *
purple_protocol_manager_get_all(PurpleProtocolManager *manager) {
PurpleProtocolManagerPrivate *priv = NULL;
g_return_val_if_fail(PURPLE_IS_PROTOCOL_MANAGER(manager), NULL);
priv = purple_protocol_manager_get_instance_private(manager);
return g_hash_table_get_values(priv->protocols);
}