changeset
Always show the user list in pidgin conversations
Wed, 15 Jun 2022 00:34:24 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Wed, 15 Jun 2022 00:34:24 -0500
- changeset 41434
- 31c7fd8a23f2
- parent 41433
- d563b345a096
- child 41435
- c46c43e89f34
Always show the user list in pidgin conversations
Testing Done:
Sent messages in an IM and a Chat.
Reviewed at https://reviews.imfreedom.org/r/1505/
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkconv.c Wed Jun 15 00:32:22 2022 -0500 +++ b/pidgin/gtkconv.c Wed Jun 15 00:34:24 2022 -0500 @@ -1745,9 +1745,8 @@ static GtkWidget * setup_common_pane(PidginConversation *gtkconv) { - GtkWidget *vbox, *input; + GtkWidget *vbox, *input, *hpaned; PurpleConversation *conv = gtkconv->active_conv; - gboolean chat = PURPLE_IS_CHAT_CONVERSATION(conv); /* Setup the top part of the pane */ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); @@ -1773,23 +1772,17 @@ gtkconv->history = talkatu_history_new(); gtk_container_add(GTK_CONTAINER(gtkconv->history_sw), gtkconv->history); - if (chat) { - GtkWidget *hpaned; - - /* Add the topic */ - setup_chat_topic(gtkconv, vbox); - - /* Add the talkatu history */ - hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); - gtk_widget_show(hpaned); - gtk_paned_pack1(GTK_PANED(hpaned), gtkconv->history_sw, TRUE, TRUE); - - /* Now add the userlist */ - setup_chat_userlist(gtkconv, hpaned); - } else { - gtk_box_pack_start(GTK_BOX(vbox), gtkconv->history_sw, TRUE, TRUE, 0); - } + /* Add the topic */ + setup_chat_topic(gtkconv, vbox); + + /* Add the talkatu history */ + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + gtk_paned_pack1(GTK_PANED(hpaned), gtkconv->history_sw, TRUE, TRUE); + + /* Now add the userlist */ + setup_chat_userlist(gtkconv, hpaned); gtk_widget_show_all(gtkconv->history_sw); g_object_set_data(G_OBJECT(gtkconv->history), "gtkconv", gtkconv);
