Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
3303:1eb4b3d0fc9d | 3304:7c5325f460de |
---|---|
2241 NULL, _("Save Conversation"), | 2241 NULL, _("Save Conversation"), |
2242 _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c); | 2242 _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c); |
2243 | 2243 |
2244 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 2244 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
2245 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 2245 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
2246 NULL, NULL, _("Enable sounds"), | 2246 NULL, NULL, _("Sound"), |
2247 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(toggle_sound), c); | 2247 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(toggle_sound), c); |
2248 c->makesound = 1; | 2248 c->makesound = 1; |
2249 | 2249 |
2250 /* use a slicker look if the user wants to */ | 2250 /* use a slicker look if the user wants to */ |
2251 if (misc_options & OPT_MISC_COOL_LOOK) { | 2251 if (misc_options & OPT_MISC_COOL_LOOK) { |
2835 gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0); | 2835 gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0); |
2836 | 2836 |
2837 gtk_object_set_user_data(GTK_OBJECT(entry), c); | 2837 gtk_object_set_user_data(GTK_OBJECT(entry), c); |
2838 gtk_text_set_editable(GTK_TEXT(entry), TRUE); | 2838 gtk_text_set_editable(GTK_TEXT(entry), TRUE); |
2839 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE); | 2839 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE); |
2840 | |
2841 #if !GTK_CHECK_VERSION(1,3,0) /* This gtk bug should be fixed in gtk2 */ | |
2840 /* I hate hackish workarounds. According to Ari Pollak, a gtk bug causes Gaim to loop | 2842 /* I hate hackish workarounds. According to Ari Pollak, a gtk bug causes Gaim to loop |
2841 * infinitely if the entry is smaller than the text height. This is a hackish workaround */ | 2843 * infinitely if the entry is smaller than the text height. This is a hackish workaround */ |
2842 gtk_widget_set_usize(entry, conv_size.width - 20, | 2844 gtk_widget_set_usize(entry, conv_size.width - 20, |
2843 MAX(conv_size.entry_height, | 2845 MAX(conv_size.entry_height, |
2844 gdk_char_height(gtk_widget_get_default_style()->font, '0') + | 2846 gdk_char_height(gtk_widget_get_default_style()->font, '0') + |
2845 gtk_widget_get_default_style()->font->ascent + 1)); | 2847 gtk_widget_get_default_style()->font->ascent + 1)); |
2848 #endif | |
2846 | 2849 |
2847 gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c); | 2850 gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c); |
2848 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c); | 2851 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c); |
2849 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed), | 2852 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed), |
2850 entry); | 2853 entry); |