# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1023418651 0
# Node ID 7c5325f460dea9373ee7bf470443a9a35f3cbc73
# Parent  1eb4b3d0fc9d110b365b2e3e370204552e7ffe36
[gaim-migrate @ 3322]
a few fixes

committer: Tailor Script <tailor@pidgin.im>

diff -r 1eb4b3d0fc9d -r 7c5325f460de src/conversation.c
--- a/src/conversation.c	Tue Jun 04 23:43:58 2002 +0000
+++ b/src/conversation.c	Fri Jun 07 02:57:31 2002 +0000
@@ -2243,7 +2243,7 @@
 
 	speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 					     GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					     NULL, NULL, _("Enable sounds"),
+					     NULL, NULL, _("Sound"),
 					     _("Sound"), speaker_p, GTK_SIGNAL_FUNC(toggle_sound), c);
 	c->makesound = 1;
 
@@ -2837,12 +2837,15 @@
 	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);
+
+#if !GTK_CHECK_VERSION(1,3,0) /* This gtk bug should be fixed in gtk2 */
 	/* I hate hackish workarounds.  According to Ari Pollak, a gtk bug causes Gaim to loop
 	 * infinitely if the entry is smaller than the text height.  This is a hackish workaround */ 
 	gtk_widget_set_usize(entry, conv_size.width - 20, 
-		MAX(conv_size.entry_height, 
-			gdk_char_height(gtk_widget_get_default_style()->font, '0') +
-			gtk_widget_get_default_style()->font->ascent + 1));
+			     MAX(conv_size.entry_height, 
+				 gdk_char_height(gtk_widget_get_default_style()->font, '0') +
+				 gtk_widget_get_default_style()->font->ascent + 1));
+#endif
 
 	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);