--- a/pidgin/gtkutils.c Sun Mar 19 03:38:11 2023 -0500
+++ b/pidgin/gtkutils.c Mon Mar 20 02:39:13 2023 -0500
@@ -45,6 +45,7 @@
+#include "pidginaccountchooser.h" /******************************************************************************
@@ -74,7 +75,7 @@
PidginFilterBuddyCompletionEntryFunc filter_func;
gpointer filter_func_user_data;
@@ -121,24 +122,6 @@
-aop_option_menu_select_by_data(GtkWidget *optmenu, gpointer data)
- model = gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu));
- if (gtk_tree_model_get_iter_first(model, &iter)) {
- gtk_tree_model_get(model, &iter, AOP_DATA_COLUMN, &iter_data, -1);
- if (iter_data == data) {
- gtk_combo_box_set_active_iter(GTK_COMBO_BOX(optmenu), &iter);
- } while (gtk_tree_model_iter_next(model, &iter));
pidgin_retrieve_user_info(PurpleConnection *conn, const char *name) {
PurpleNotifyUserInfo *info = NULL;
@@ -232,8 +215,7 @@
PidginCompletionData *data)
- GtkWidget *optmenu = data->accountopt;
- PurpleAccount *account;
+ PurpleAccount *account = NULL; gtk_tree_model_get_value(model, iter, COMPLETION_BUDDY_COLUMN, &val);
@@ -244,11 +226,14 @@
account = g_value_get_pointer(&val);
+ if(!PURPLE_IS_ACCOUNT(account)) {
- aop_option_menu_select_by_data(optmenu, account);
+ if(PIDGIN_IS_ACCOUNT_CHOOSER(data->chooser)) { + pidgin_account_chooser_set_selected(PIDGIN_ACCOUNT_CHOOSER(data->chooser), @@ -432,7 +417,7 @@
- data->accountopt = chooser;
+ data->chooser = chooser; if (filter_func == NULL) {
data->filter_func = pidgin_screenname_autocomplete_default_filter;
data->filter_func_user_data = NULL;