# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 976501617 0
# Node ID 25611364a5041d7b1c20b03fe56a5d460c0a0fe4
# Parent  ec046fc9fc7ac91e00f131ed8d58137e7a56e72a
[gaim-migrate @ 1237]
ok, the toolbar should work again (right?)

committer: Tailor Script <tailor@pidgin.im>

diff -r ec046fc9fc7a -r 25611364a504 src/buddy_chat.c
--- a/src/buddy_chat.c	Sat Dec 09 10:17:48 2000 +0000
+++ b/src/buddy_chat.c	Mon Dec 11 02:26:57 2000 +0000
@@ -641,11 +641,12 @@
 	gtk_paned_pack2(GTK_PANED(vpaned), vbox, TRUE, FALSE);
 	gtk_widget_show(vbox);
 
+	chatentry = gtk_text_new( NULL, NULL );
+	b->entry = chatentry;
+
 	toolbar = build_conv_toolbar(b);
 	gtk_box_pack_start(GTK_BOX(vbox), toolbar, TRUE, TRUE, 5);
 
-	chatentry = gtk_text_new( NULL, NULL );
-	b->entry = chatentry;
 	gtk_object_set_user_data(GTK_OBJECT(chatentry), b);
 	gtk_text_set_editable(GTK_TEXT(chatentry), TRUE);
 	gtk_text_set_word_wrap(GTK_TEXT(chatentry), TRUE);
diff -r ec046fc9fc7a -r 25611364a504 src/conversation.c
--- a/src/conversation.c	Sat Dec 09 10:17:48 2000 +0000
+++ b/src/conversation.c	Mon Dec 11 02:26:57 2000 +0000
@@ -1784,11 +1784,12 @@
 
 	create_convo_menu(c);
 
+	entry = gtk_text_new(NULL, NULL);
+	c->entry = entry;
+
 	toolbar = build_conv_toolbar(c);
 	gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 5);
 
-	entry = gtk_text_new(NULL, NULL);
-	c->entry = entry;
 	gtk_object_set_user_data(GTK_OBJECT(entry), c);
 	gtk_text_set_editable(GTK_TEXT(entry), TRUE);
 	gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE);