Mercurial > pidgin.yaz
diff src/conversation.c @ 3304:7c5325f460de
[gaim-migrate @ 3322]
a few fixes
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 07 Jun 2002 02:57:31 +0000 |
| parents | c5b4e55024e3 |
| children | 522f37c9f9d2 |
line wrap: on
line diff
--- 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);