comparison src/gtkconv.c @ 8897:8ffd1679df93

[gaim-migrate @ 9666] Remove New window width, new window heigh, entry field height and hide on send. The width and height prefs still need to update themselves when the conversation window is resized. Any volunteers? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 06 May 2004 23:56:52 +0000
parents 25344c2d74c4
children a9ad52960c1c
comparison
equal deleted inserted replaced
8896:136b4e159d04 8897:8ffd1679df93
326 gaim_conv_im_send(GAIM_CONV_IM(conv), buf); 326 gaim_conv_im_send(GAIM_CONV_IM(conv), buf);
327 else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) 327 else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
328 gaim_conv_chat_send(GAIM_CONV_CHAT(conv), buf); 328 gaim_conv_chat_send(GAIM_CONV_CHAT(conv), buf);
329 } 329 }
330 330
331 if (gaim_prefs_get_bool("/gaim/gtk/conversations/im/hide_on_send"))
332 gaim_conv_window_hide(gaim_conversation_get_window(conv));
333
334 g_free(clean); 331 g_free(clean);
335 g_free(buf); 332 g_free(buf);
336 333
337 gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry)); 334 gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
338 default_formatize(conv); 335 default_formatize(conv);
3796 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); 3793 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
3797 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(gtkconv->sw), 3794 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(gtkconv->sw),
3798 GTK_SHADOW_IN); 3795 GTK_SHADOW_IN);
3799 gtk_box_pack_start(GTK_BOX(vbox), gtkconv->sw, TRUE, TRUE, 0); 3796 gtk_box_pack_start(GTK_BOX(vbox), gtkconv->sw, TRUE, TRUE, 0);
3800 3797
3798 /* XXX - The following two prefs need to be set whenever the window is resized. */
3801 gtk_widget_set_size_request(gtkconv->sw, 3799 gtk_widget_set_size_request(gtkconv->sw,
3802 gaim_prefs_get_int("/gaim/gtk/conversations/im/default_width"), 3800 gaim_prefs_get_int("/gaim/gtk/conversations/im/default_width"),
3803 gaim_prefs_get_int("/gaim/gtk/conversations/im/default_height")); 3801 gaim_prefs_get_int("/gaim/gtk/conversations/im/default_height"));
3804 gtk_widget_show(gtkconv->sw); 3802 gtk_widget_show(gtkconv->sw);
3805 3803
3860 gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry)); 3858 gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
3861 gaim_setup_imhtml(gtkconv->entry); 3859 gaim_setup_imhtml(gtkconv->entry);
3862 gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE); 3860 gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
3863 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), 3861 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry),
3864 GTK_WRAP_WORD_CHAR); 3862 GTK_WRAP_WORD_CHAR);
3863 /* XXX - The following pref needs to be set whenever the window is resized. */
3865 gtk_widget_set_size_request(gtkconv->entry, -1, 3864 gtk_widget_set_size_request(gtkconv->entry, -1,
3866 gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height")); 3865 gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"));
3867 g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); 3866 g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
3868 3867
3869 g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", 3868 g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",
4553 4552
4554 if (!(flags & GAIM_MESSAGE_NO_LOG) && 4553 if (!(flags & GAIM_MESSAGE_NO_LOG) &&
4555 ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT && 4554 ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
4556 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) || 4555 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
4557 (gaim_conversation_get_type(conv) == GAIM_CONV_IM && 4556 (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
4558 (gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events") || 4557 gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
4559 gaim_prefs_get_bool("/gaim/gtk/conversations/im/hide_on_send"))))) {
4560 4558
4561 gaim_conv_window_show(win); 4559 gaim_conv_window_show(win);
4562 } 4560 }
4563 4561
4564 if (flags & GAIM_MESSAGE_IMAGES) 4562 if (flags & GAIM_MESSAGE_IMAGES)
5883 /* Conversations -> IM */ 5881 /* Conversations -> IM */
5884 gaim_prefs_add_none("/gaim/gtk/conversations/im"); 5882 gaim_prefs_add_none("/gaim/gtk/conversations/im");
5885 gaim_prefs_add_int("/gaim/gtk/conversations/im/button_type", 5883 gaim_prefs_add_int("/gaim/gtk/conversations/im/button_type",
5886 GAIM_BUTTON_TEXT_IMAGE); 5884 GAIM_BUTTON_TEXT_IMAGE);
5887 gaim_prefs_add_bool("/gaim/gtk/conversations/im/animate_buddy_icons", TRUE); 5885 gaim_prefs_add_bool("/gaim/gtk/conversations/im/animate_buddy_icons", TRUE);
5888 gaim_prefs_add_bool("/gaim/gtk/conversations/im/hide_on_send", FALSE);
5889 gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE); 5886 gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
5890 gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); 5887 gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE);
5891 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410); 5888 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410);
5892 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_height", 160); 5889 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_height", 160);
5893 gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50); 5890 gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50);