From: Christian H. <ch...@us...> - 2003-04-01 16:57:15
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv15110 Modified Files: gtkconv.c Log Message: This is about right, more or less. Chats are fixed! Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- gtkconv.c 1 Apr 2003 08:25:37 -0000 1.86 +++ gtkconv.c 1 Apr 2003 16:57:05 -0000 1.87 @@ -2931,6 +2931,29 @@ gtk_widget_show(gtkchat->topic_text); } + /* Build the toolbar. */ + gtkconv->toolbar.toolbar = build_conv_toolbar(conv); + gtk_box_pack_start(GTK_BOX(vbox), gtkconv->toolbar.toolbar, + FALSE, FALSE, 0); + + /* Setup the entry widget. */ + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + gtk_widget_show(frame); + + gtkconv->entry_buffer = gtk_text_buffer_new(NULL); + g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); + gtkconv->entry = gtk_text_view_new_with_buffer(gtkconv->entry_buffer); + + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD); + gtk_widget_set_size_request(gtkconv->entry, -1, + MAX(buddy_chat_size.entry_height, 25)); + + vbox = gtk_vbox_new(FALSE, 5); + gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, FALSE); + gtk_widget_show(vbox); + /* Setup the horizontal pane. */ hpaned = gtk_hpaned_new(); gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 5); @@ -3056,28 +3079,6 @@ gtkconv->info = button; - /* Build the toolbar. */ - vbox = gtk_vbox_new(FALSE, 5); - gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, FALSE); - gtk_widget_show(vbox); - - gtkconv->toolbar.toolbar = build_conv_toolbar(conv); - gtk_box_pack_start(GTK_BOX(vbox), gtkconv->toolbar.toolbar, - FALSE, FALSE, 0); - - /* Setup the entry widget. */ - frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); - gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); - gtk_widget_show(frame); - - gtkconv->entry_buffer = gtk_text_buffer_new(NULL); - g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); - gtkconv->entry = gtk_text_view_new_with_buffer(gtkconv->entry_buffer); - - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD); - gtk_widget_set_size_request(gtkconv->entry, -1, - MAX(buddy_chat_size.entry_height, 25)); /* Connect the signal handlers. */ g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "key_press_event", |