changeset
Use PidginAccountDisplay in the request dialogs
Mon, 20 Mar 2023 22:27:22 -0500
- author
- Elliott Sales de Andrade <quantum.analyst@gmail.com>
- date
- Mon, 20 Mar 2023 22:27:22 -0500
- changeset 42166
- 6b2ba7253a36
- parent 42165
- 3c481d9cc840
- child 42167
- 5240fe0d7bdc
Use PidginAccountDisplay in the request dialogs
I then moved this from the hbox to the vbox so that it wouldn't widen the dialog.
This is not the best place yet, but the request dialogs need further work.
Testing Done:
Opened Request dialogs from the Demo protocol.
Reviewed at https://reviews.imfreedom.org/r/2361/
| pidgin/gtkrequest.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkrequest.c Mon Mar 20 22:25:54 2023 -0500 +++ b/pidgin/gtkrequest.c Mon Mar 20 22:27:22 2023 -0500 @@ -29,6 +29,7 @@ #include "gtkblist.h" #include "gtkutils.h" #include "pidginaccountchooser.h" +#include "pidginaccountdisplay.h" #include "pidginaccountfilterconnected.h" #include "pidgincore.h" @@ -86,28 +87,19 @@ static void pidgin_widget_decorate_account(GtkWidget *cont, PurpleAccount *account) { - PurpleContactInfo *info = NULL; - PurpleProtocol *protocol = NULL; - GtkWidget *image; - const gchar *icon_name = NULL; + GtkWidget *display = NULL; if(!PURPLE_IS_ACCOUNT(account)) { return; } - info = PURPLE_CONTACT_INFO(account); - protocol = purple_account_get_protocol(account); - icon_name = purple_protocol_get_icon_name(protocol); - - image = gtk_image_new_from_icon_name(icon_name); - - gtk_widget_set_tooltip_text(image, purple_contact_info_get_username(info)); - - if (GTK_IS_BOX(cont)) { - gtk_widget_set_halign(image, GTK_ALIGN_START); - gtk_widget_set_valign(image, GTK_ALIGN_START); - gtk_box_append(GTK_BOX(cont), image); + if(!GTK_IS_BOX(cont)) { + return; } + + display = pidgin_account_display_new(account); + gtk_widget_set_halign(display, GTK_ALIGN_CENTER); + gtk_box_append(GTK_BOX(cont), display); } static void @@ -509,7 +501,8 @@ gtk_widget_set_hexpand(vbox, TRUE); gtk_box_append(GTK_BOX(hbox), vbox); - pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar)); + pidgin_widget_decorate_account(vbox, + purple_request_cpar_get_account(cpar)); /* Descriptive label */ primary_esc = pidgin_request_escape(cpar, primary); @@ -667,14 +660,15 @@ gtk_widget_set_valign(img, GTK_ALIGN_START); gtk_box_append(GTK_BOX(hbox), img); - pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar)); - pidgin_request_add_help(GTK_DIALOG(dialog), cpar); /* Vertical box */ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); gtk_box_append(GTK_BOX(hbox), vbox); + pidgin_widget_decorate_account(vbox, + purple_request_cpar_get_account(cpar)); + /* Descriptive label */ primary_esc = pidgin_request_escape(cpar, primary); secondary_esc = pidgin_request_escape(cpar, secondary); @@ -814,8 +808,8 @@ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); gtk_box_append(GTK_BOX(hbox), vbox); - pidgin_widget_decorate_account(hbox, - purple_request_cpar_get_account(cpar)); + pidgin_widget_decorate_account(vbox, + purple_request_cpar_get_account(cpar)); pidgin_request_add_help(GTK_DIALOG(dialog), cpar); @@ -932,8 +926,8 @@ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); gtk_box_append(GTK_BOX(hbox), vbox); - pidgin_widget_decorate_account(hbox, - purple_request_cpar_get_account(cpar)); + pidgin_widget_decorate_account(vbox, + purple_request_cpar_get_account(cpar)); pidgin_request_add_help(GTK_DIALOG(dialog), cpar); @@ -1929,14 +1923,14 @@ } gtk_dialog_set_default_response(GTK_DIALOG(win), response); - pidgin_widget_decorate_account(hbox, - purple_request_cpar_get_account(cpar)); - /* Setup the vbox */ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); gtk_widget_set_hexpand(vbox, TRUE); gtk_box_append(GTK_BOX(hbox), vbox); + pidgin_widget_decorate_account(vbox, + purple_request_cpar_get_account(cpar)); + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); datasheet_buttons_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
