comparison src/gtkconv.c @ 9301:3d5519a84d02

[gaim-migrate @ 10105] Some stuff. Mostly from nosnilmot. Re-split the raise on events preference for IMs and chats. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 17 Jun 2004 01:18:21 +0000
parents 98f01c233a40
children 8e1ddf5d81d0
comparison
equal deleted inserted replaced
9300:98f01c233a40 9301:3d5519a84d02
4678 gtkwin = GAIM_GTK_WINDOW(gaimwin); 4678 gtkwin = GAIM_GTK_WINDOW(gaimwin);
4679 4679
4680 g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL); 4680 g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL);
4681 4681
4682 if (!(flags & GAIM_MESSAGE_NO_LOG) && 4682 if (!(flags & GAIM_MESSAGE_NO_LOG) &&
4683 gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) { 4683 gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")) {
4684 4684
4685 gaim_conv_window_raise(gaim_conversation_get_window(conv)); 4685 gaim_conv_window_raise(gaim_conversation_get_window(conv));
4686 } 4686 }
4687 4687
4688 /* Play a sound, if specified in prefs. */ 4688 /* Play a sound, if specified in prefs. */
4743 flags |= GAIM_MESSAGE_COLORIZE; 4743 flags |= GAIM_MESSAGE_COLORIZE;
4744 4744
4745 /* Raise the window, if specified in prefs. */ 4745 /* Raise the window, if specified in prefs. */
4746 if (!(flags & GAIM_MESSAGE_NO_LOG) && 4746 if (!(flags & GAIM_MESSAGE_NO_LOG) &&
4747 /* we may want to change this */ 4747 /* we may want to change this */
4748 gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) { 4748 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) {
4749 4749
4750 gaim_conv_window_raise(gaim_conversation_get_window(conv)); 4750 gaim_conv_window_raise(gaim_conversation_get_window(conv));
4751 } 4751 }
4752 4752
4753 gaim_conversation_write(conv, who, message, flags, mtime); 4753 gaim_conversation_write(conv, who, message, flags, mtime);
4774 gtkconv = GAIM_GTK_CONVERSATION(conv); 4774 gtkconv = GAIM_GTK_CONVERSATION(conv);
4775 gc = gaim_conversation_get_gc(conv); 4775 gc = gaim_conversation_get_gc(conv);
4776 4776
4777 win = gaim_conversation_get_window(conv); 4777 win = gaim_conversation_get_window(conv);
4778 4778
4779 if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) { 4779 if (!(flags & GAIM_MESSAGE_NO_LOG) &&
4780 ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
4781 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
4782 (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
4783 gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
4780 gaim_conv_window_show(win); 4784 gaim_conv_window_show(win);
4781 } 4785 }
4782 4786
4783 if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml)))) 4787 if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
4784 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0); 4788 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0);
6027 gaim_prefs_add_int("/gaim/gtk/conversations/font_size", 3); 6031 gaim_prefs_add_int("/gaim/gtk/conversations/font_size", 3);
6028 gaim_prefs_add_bool("/gaim/gtk/conversations/tabs", TRUE); 6032 gaim_prefs_add_bool("/gaim/gtk/conversations/tabs", TRUE);
6029 gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP); 6033 gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP);
6030 gaim_prefs_add_int("/gaim/gtk/conversations/button_type", 6034 gaim_prefs_add_int("/gaim/gtk/conversations/button_type",
6031 GAIM_BUTTON_TEXT_IMAGE); 6035 GAIM_BUTTON_TEXT_IMAGE);
6032 gaim_prefs_add_bool("/gaim/gtk/conversations/raise_on_events", FALSE); 6036 gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
6037 gaim_prefs_add_bool("/gaim/gtk/conversations/chat/raise_on_events", FALSE);
6033 6038
6034 6039
6035 /* Conversations -> Chat */ 6040 /* Conversations -> Chat */
6036 gaim_prefs_add_none("/gaim/gtk/conversations/chat"); 6041 gaim_prefs_add_none("/gaim/gtk/conversations/chat");
6037 gaim_prefs_add_bool("/gaim/gtk/conversations/chat/color_nicks", TRUE); 6042 gaim_prefs_add_bool("/gaim/gtk/conversations/chat/color_nicks", TRUE);