[Gaim-commits] CVS: gaim/src buddy_chat.c,1.139,1.140 conversation.c,1.319,1.320

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv32598

Modified Files:
	buddy_chat.c conversation.c 
Log Message:
this is a work-around for a bug in gtk. i knew it wasn't my fault. i hate all of you.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- buddy_chat.c	2001/12/13 01:35:16	1.139
+++ buddy_chat.c	2001/12/20 09:26:12	1.140
@@ -1276,7 +1276,7 @@
 	if (convo_options & OPT_CONVO_CHECK_SPELLING)
 		gtkspell_attach(GTK_TEXT(chatentry));
 	gtk_box_pack_start(GTK_BOX(vbox), chatentry, TRUE, TRUE, 0);
-	gtk_widget_set_usize(chatentry, buddy_chat_size.width, buddy_chat_size.entry_height);
+	gtk_widget_set_usize(chatentry, buddy_chat_size.width, MAX(buddy_chat_size.entry_height, 25));
 	gtk_window_set_focus(GTK_WINDOW(win), chatentry);
 	gtk_widget_show(chatentry);
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- conversation.c	2001/12/16 21:50:36	1.319
+++ conversation.c	2001/12/20 09:26:12	1.320
@@ -2391,7 +2391,7 @@
 	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);
-	gtk_widget_set_usize(entry, conv_size.width - 20, conv_size.entry_height);
+	gtk_widget_set_usize(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25));
 
 	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c);
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);