pidgin/pidgin

Fix a few issues with the CredentialProvider code that snuck past review

2020-10-14, Gary Kramlich
569ab1326932
Fix a few issues with the CredentialProvider code that snuck past review

Testing Done:
Compiled and ran unit tests locally. Verified the warnings were gone from the unit test build and verified the warning was gone from the Purple-3.0.gir build.

Reviewed at https://reviews.imfreedom.org/r/168/
/*
* Pidgin - Internet Messenger
* Copyright (C) Pidgin Developers <devel@pidgin.im>
*
* Pidgin is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "pidgin/pidginprotocolstore.h"
#include "gtkutils.h"
struct _PidginProtocolStore {
GtkListStore parent;
};
/******************************************************************************
* Helpers
*****************************************************************************/
static void
pidgin_protocol_store_add_protocol(PidginProtocolStore *store,
PurpleProtocol *protocol)
{
GtkTreeIter iter;
GdkPixbuf *pixbuf = NULL;
pixbuf = pidgin_create_icon_from_protocol(protocol,
PIDGIN_PROTOCOL_ICON_SMALL, NULL);
gtk_list_store_append(GTK_LIST_STORE(store), &iter);
gtk_list_store_set(
GTK_LIST_STORE(store),
&iter,
PIDGIN_PROTOCOL_STORE_COLUMN_PROTOCOL, protocol,
PIDGIN_PROTOCOL_STORE_COLUMN_NAME, purple_protocol_get_name(protocol),
PIDGIN_PROTOCOL_STORE_COLUMN_ICON, pixbuf,
-1
);
g_clear_object(&pixbuf);
}
static void
pidgin_protocol_store_add_protocol_helper(gpointer data, gpointer user_data) {
if(PURPLE_IS_PROTOCOL(data)) {
pidgin_protocol_store_add_protocol(PIDGIN_PROTOCOL_STORE(user_data),
PURPLE_PROTOCOL(data));
}
}
static void
pidgin_protocol_store_add_protocols(PidginProtocolStore *store) {
g_list_foreach(purple_protocols_get_all(),
pidgin_protocol_store_add_protocol_helper, store);
}
static void
pidgin_protocol_store_remove_protocol(PidginProtocolStore *store,
PurpleProtocol *protocol)
{
GtkTreeIter iter;
if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter) == FALSE) {
purple_debug_warning("protocol-store",
"protocol %s was removed but not in the store",
purple_protocol_get_name(protocol));
return;
}
/* walk through the store and look for the protocol to remove */
do {
PurpleProtocol *prpl = NULL;
gtk_tree_model_get(
GTK_TREE_MODEL(store),
&iter,
PIDGIN_PROTOCOL_STORE_COLUMN_PROTOCOL, &prpl,
-1
);
if(prpl == protocol) {
g_object_unref(G_OBJECT(prpl));
gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
return;
}
} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
}
/******************************************************************************
* Callbacks
*****************************************************************************/
static void
pidgin_protocol_store_protocol_added_cb(PurpleProtocol *protocol,
gpointer data)
{
pidgin_protocol_store_add_protocol(PIDGIN_PROTOCOL_STORE(data), protocol);
}
static void
pidgin_protocol_store_protocol_removed_cb(PurpleProtocol *protocol,
gpointer data)
{
pidgin_protocol_store_remove_protocol(PIDGIN_PROTOCOL_STORE(data), protocol);
}
/******************************************************************************
* GObject Implementation
*****************************************************************************/
G_DEFINE_TYPE(PidginProtocolStore, pidgin_protocol_store, GTK_TYPE_LIST_STORE)
static void
pidgin_protocol_store_init(PidginProtocolStore *store) {
gpointer protocols_handle = NULL;
GType types[PIDGIN_PROTOCOL_STORE_N_COLUMNS] = {
PURPLE_TYPE_PROTOCOL,
G_TYPE_STRING,
GDK_TYPE_PIXBUF,
};
gtk_list_store_set_column_types(
GTK_LIST_STORE(store),
PIDGIN_PROTOCOL_STORE_N_COLUMNS,
types
);
/* add the known protocols */
pidgin_protocol_store_add_protocols(store);
/* add the signal handlers to dynamically add/remove protocols */
protocols_handle = purple_protocols_get_handle();
purple_signal_connect(protocols_handle, "protocol-added", store,
G_CALLBACK(pidgin_protocol_store_protocol_added_cb),
store);
purple_signal_connect(protocols_handle, "protocol-removed", store,
G_CALLBACK(pidgin_protocol_store_protocol_removed_cb),
store);
}
static void
pidgin_protocol_store_finalize(GObject *obj) {
purple_signals_disconnect_by_handle(obj);
G_OBJECT_CLASS(pidgin_protocol_store_parent_class)->finalize(obj);
}
static void
pidgin_protocol_store_class_init(PidginProtocolStoreClass *klass) {
GObjectClass *obj_class = G_OBJECT_CLASS(klass);
obj_class->finalize = pidgin_protocol_store_finalize;
}
/******************************************************************************
* API
*****************************************************************************/
GtkListStore *
pidgin_protocol_store_new(void) {
return GTK_LIST_STORE(g_object_new(PIDGIN_TYPE_PROTOCOL_STORE, NULL));
}