Fix leaks from g_list_model_get_item

It returns a new reference, which needs to be unref'd.

Testing Done:
Compiled only, and ran tests, though these issues didn't show up in valgrind anyway.

Reviewed at https://reviews.imfreedom.org/r/2377/

7 files changed, 19 insertions, 11 deletions

diff --git a/libpurple/protocols/ircv3/purpleircv3messagehandlers.c b/libpurple/protocols/ircv3/purpleircv3messagehandlers.c
index 08d813f211..9151f59d8d 100644
--- a/libpurple/protocols/ircv3/purpleircv3messagehandlers.c
+++ b/libpurple/protocols/ircv3/purpleircv3messagehandlers.c
@@ -110,6 +110,7 @@ purple_ircv3_message_handler_privmsg(GHashTable *tags,
 		purple_contact_info_set_username(PURPLE_CONTACT_INFO(contact), source);
 		purple_contact_manager_add(contact_manager, contact);
 	}
+	g_clear_object(&contact);
 
 	target = params[0];
 	conversation_manager = purple_conversation_manager_get_default();
diff --git a/libpurple/purplecontactmanager.h b/libpurple/purplecontactmanager.h
index 2c6a92168f..146fb10c34 100644
--- a/libpurple/purplecontactmanager.h
+++ b/libpurple/purplecontactmanager.h
@@ -119,7 +119,7 @@ GListModel *purple_contact_manager_get_all(PurpleContactManager *manager, Purple
  * Looks for a [class@Purple.Contact] that belongs to @account with a username
  * of @username.
  *
- * Returns: (transfer none): The [class@Purple.Contact] if found, otherwise
+ * Returns: (transfer full): The [class@Purple.Contact] if found, otherwise
  *          %NULL.
  *
  * Since: 3.0.0
@@ -134,7 +134,7 @@ PurpleContact *purple_contact_manager_find_with_username(PurpleContactManager *m
  *
  * Looks for a [class@Purple.Contact] that belongs to @account with a id of @id.
  *
- * Returns: (transfer none): The [class@Purple.Contact] if found, otherwise
+ * Returns: (transfer full): The [class@Purple.Contact] if found, otherwise
  *          %NULL.
  *
  * Since: 3.0.0
diff --git a/libpurple/tests/test_contact_manager.c b/libpurple/tests/test_contact_manager.c
index 010f3584ad..7b21ab7a46 100644
--- a/libpurple/tests/test_contact_manager.c
+++ b/libpurple/tests/test_contact_manager.c
@@ -292,6 +292,7 @@ test_purple_contact_manager_add_buddy(void) {
 	contact = purple_contact_manager_find_with_id(manager, account, id);
 	g_assert_nonnull(contact);
 	g_assert_true(PURPLE_IS_CONTACT(contact));
+	g_clear_object(&contact);
 
 	/* Verify that we can find the created contact via username. */
 	contact = purple_contact_manager_find_with_username(manager, account,
diff --git a/pidgin/pidginaccounteditor.c b/pidgin/pidginaccounteditor.c
index 05021d668a..58662b0c9b 100644
--- a/pidgin/pidginaccounteditor.c
+++ b/pidgin/pidginaccounteditor.c
@@ -615,10 +615,12 @@ pidgin_account_editor_update_proxy_options(PidginAccountEditor *editor) {
 	}
 
 	model = adw_combo_row_get_model(ADW_COMBO_ROW(editor->proxy_type));
-	for(guint i = 0; i < g_list_model_get_n_items(model); i++) {
-		GtkStringObject *obj = g_list_model_get_item(model, i);
-		if(purple_strequal(type, gtk_string_object_get_string(obj))) {
-			position = i;
+	for(guint index = 0; index < g_list_model_get_n_items(model); index++) {
+		const char *value = gtk_string_list_get_string(GTK_STRING_LIST(model),
+		                                               index);
+
+		if(purple_strequal(type, value)) {
+			position = index;
 			break;
 		}
 	}
diff --git a/pidgin/pidgincontactlist.c b/pidgin/pidgincontactlist.c
index 6d84032ca3..91a4047927 100644
--- a/pidgin/pidgincontactlist.c
+++ b/pidgin/pidgincontactlist.c
@@ -139,6 +139,7 @@ pidgin_contact_list_activate_cb(GtkListView *self, guint position,
 	if(!PURPLE_IS_PERSON(person)) {
 		g_warning("we seem to have activated a zombie.. RUN!!!!!!");
 
+		g_clear_object(&person);
 		return;
 	}
 
@@ -153,6 +154,8 @@ pidgin_contact_list_activate_cb(GtkListView *self, guint position,
 		conversation = purple_im_conversation_new(account, name);
 		purple_conversation_manager_register(manager, conversation);
 	}
+
+	g_clear_object(&person);
 }
 
 static gboolean
diff --git a/pidgin/pidginprotocolchooser.c b/pidgin/pidginprotocolchooser.c
index a622dbe864..7cdcc72f4a 100644
--- a/pidgin/pidginprotocolchooser.c
+++ b/pidgin/pidginprotocolchooser.c
@@ -175,8 +175,10 @@ pidgin_protocol_chooser_set_protocol(PidginProtocolChooser *chooser,
 
 			if(this_protocol == protocol) {
 				position = i;
+				g_object_unref(this_protocol);
 				break;
 			}
+			g_object_unref(this_protocol);
 		}
 	}
 
diff --git a/pidgin/prefs/pidginprefs.c b/pidgin/prefs/pidginprefs.c
index 9296f25dde..3a5d597d69 100644
--- a/pidgin/prefs/pidginprefs.c
+++ b/pidgin/prefs/pidginprefs.c
@@ -378,16 +378,15 @@ bind_combo_row_set(GObject *obj, G_GNUC_UNUSED GParamSpec *pspec,
 
 void
 pidgin_prefs_bind_combo_row(const gchar *key, GtkWidget *widget) {
-	GListModel *model = NULL;
+	GtkStringList *model = NULL;
 	const char *pref_value = NULL;
 	guint selected = GTK_INVALID_LIST_POSITION;
 
 	pref_value = purple_prefs_get_string(key);
-	model = adw_combo_row_get_model(ADW_COMBO_ROW(widget));
+	model = GTK_STRING_LIST(adw_combo_row_get_model(ADW_COMBO_ROW(widget)));
 
-	for(guint i = 0; i < g_list_model_get_n_items(model); i++) {
-		GtkStringObject *obj = g_list_model_get_item(model, i);
-		const gchar *value = gtk_string_object_get_string(obj);
+	for(guint i = 0; i < g_list_model_get_n_items(G_LIST_MODEL(model)); i++) {
+		const char *value = gtk_string_list_get_string(model, i);
 
 		if (purple_strequal(pref_value, value)) {
 			selected = i;