# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1034571151 0
# Node ID e3583f15dfe0431632d204e7f4f7d05a9fd73b2e
# Parent  73c2b924703e0ea53c914d8f212ba2764c416f9a
[gaim-migrate @ 3813]
Does this work better?

committer: Tailor Script <tailor@pidgin.im>

diff -r 73c2b924703e -r e3583f15dfe0 src/buddy_chat.c
--- a/src/buddy_chat.c	Mon Oct 14 04:33:17 2002 +0000
+++ b/src/buddy_chat.c	Mon Oct 14 04:52:31 2002 +0000
@@ -1175,6 +1175,8 @@
 
 	if (chat_options & OPT_CHAT_ONE_WINDOW) {
 		if (!all_chats) {
+			GtkWidget *testidea;
+
 			win = all_chats = b->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 			if ((convo_options & OPT_CONVO_COMBINE) && (im_options & OPT_IM_ONE_WINDOW))
 				all_convos = all_chats;
@@ -1206,9 +1208,14 @@
 								 GTK_POS_TOP);
 				}
 			}
+			
+			testidea = gtk_vbox_new(FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(testidea), chat_notebook, TRUE, TRUE, 0);
+			gtk_widget_show(testidea);
+
 			gtk_notebook_set_scrollable(GTK_NOTEBOOK(chat_notebook), TRUE);
 			gtk_notebook_popup_enable(GTK_NOTEBOOK(chat_notebook));
-			gtk_container_add(GTK_CONTAINER(win), chat_notebook);
+			gtk_container_add(GTK_CONTAINER(win), testidea);
 			gtk_signal_connect(GTK_OBJECT(chat_notebook), "switch-page",
 					   GTK_SIGNAL_FUNC(convo_switch), NULL);
 			gtk_widget_show(chat_notebook);
diff -r 73c2b924703e -r e3583f15dfe0 src/conversation.c
--- a/src/conversation.c	Mon Oct 14 04:33:17 2002 +0000
+++ b/src/conversation.c	Mon Oct 14 04:52:31 2002 +0000
@@ -2900,6 +2900,8 @@
 	GtkStyle *style;
 	struct conversation *c;
 	
+	printf("THIS GOT CALLED.\n");
+
 	if ((convo_options & OPT_CONVO_COMBINE) &&
 	    (im_options & OPT_IM_ONE_WINDOW) &&
 	    (chat_options & OPT_CHAT_ONE_WINDOW)) {
@@ -2926,11 +2928,13 @@
 
 	if (!c->is_chat) {
 			GtkWidget *menubar;
-			GtkWidget *parent = convo_menubar->parent;
+			GtkWidget *parent = convo_notebook->parent;
 
 			gtk_widget_freeze_child_notify(GTK_WIDGET(c->window));
-			
-			gtk_widget_destroy(convo_menubar);
+	
+			if (convo_menubar != NULL)
+					gtk_widget_destroy(convo_menubar);
+
 			menubar = build_conv_menubar(c);
 			gtk_box_pack_start(GTK_BOX(parent), menubar, FALSE, TRUE, 0);
 			gtk_box_reorder_child(GTK_BOX(parent), menubar, 0);
@@ -2939,6 +2943,7 @@
 			gtk_widget_thaw_child_notify(GTK_WIDGET(c->window));
 	} else {
 		gtk_widget_destroy(convo_menubar);
+		convo_menubar = NULL;
 	}
 }
 
@@ -3106,14 +3111,17 @@
 			
 			menubar = build_conv_menubar(c);
 			gtk_box_pack_start(GTK_BOX(testidea), menubar, FALSE, TRUE, 0);
-			gtk_box_pack_start(GTK_BOX(testidea), convo_notebook, FALSE, TRUE, 0);
+			gtk_box_pack_start(GTK_BOX(testidea), convo_notebook, TRUE, TRUE, 0);
+			gtk_widget_show(testidea);
+			gtk_widget_show(convo_notebook);
 			convo_menubar = menubar;
 
+			printf("I GOT HERE BIZNOTCHY.\n");
+
 			gtk_container_add(GTK_CONTAINER(win), testidea);
 			gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
 					   GTK_SIGNAL_FUNC(convo_switch), NULL);
-			gtk_widget_show(testidea);
-			gtk_widget_show(convo_notebook);
+
 		} else
 			win = c->window = all_convos;