--- a/pidgin/gtkconv.c Sun Nov 01 04:47:52 2020 -0600
+++ b/pidgin/gtkconv.c Sun Nov 01 04:48:35 2020 -0600
@@ -52,6 +52,7 @@
#include "gtkstyle.h"
#include "gtkutils.h"
#include "pidginclosebutton.h"
+#include "pidginconversationwindow.h"
#include "pidgincore.h"
#include "pidgingdkpixbuf.h"
#include "pidgininvitedialog.h"
@@ -7621,10 +7622,11 @@
window_list = g_list_append(window_list, win);
/* Create the window. */
- win->window = pidgin_window_new(NULL, 0, "conversation", TRUE);
+ win->window = pidgin_conversation_window_new();
/*_pidgin_widget_set_accessible_name(win->window, "Conversations");*/
- if (!gtk_get_current_event_state(&state))
+ if(!gtk_get_current_event_state(&state)) {
gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE);
+ }
/* Etan: I really think this entire function call should happen only
* when we are on Windows but I was informed that back before we used
@@ -7713,7 +7715,8 @@
g_signal_connect(G_OBJECT(win->notebook), "button_release_event",
G_CALLBACK(notebook_release_cb), win);
- testidea = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ testidea = pidgin_conversation_window_get_vbox(PIDGIN_CONVERSATION_WINDOW(win->window));
+ gtk_container_add(GTK_CONTAINER(win->window), testidea);
/* Setup the menubar. */
menubar = setup_menubar(win);
@@ -7721,10 +7724,6 @@
gtk_box_pack_start(GTK_BOX(testidea), win->notebook, TRUE, TRUE, 0);
- gtk_container_add(GTK_CONTAINER(win->window), testidea);
-
- gtk_widget_show(testidea);
-
/* Update the plugin actions when plugins are (un)loaded */
purple_signal_connect(purple_plugins_get_handle(), "plugin-load",
win, PURPLE_CALLBACK(plugin_changed_cb), win);