Mercurial > pidgin.yaz
changeset 10363:f608b72a7611
[gaim-migrate @ 11581]
Removed "raise conversation" preferences; defaulting to "No."
Etan, you should add these to notify.c sometime.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 13 Dec 2004 23:15:41 +0000 |
| parents | c398f55ce5c7 |
| children | db5e8c8b2abb |
| files | src/gtkconv.c src/gtkprefs.c |
| diffstat | 2 files changed, 2 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Mon Dec 13 23:12:18 2004 +0000 +++ b/src/gtkconv.c Mon Dec 13 23:15:41 2004 +0000 @@ -4618,12 +4618,6 @@ g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL); - if (!(flags & GAIM_MESSAGE_NO_LOG) && - gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")) { - - gaim_conv_window_raise(gaim_conversation_get_window(conv)); - } - /* Play a sound, if specified in prefs. */ if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) && !gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) { @@ -4683,14 +4677,6 @@ if (gaim_prefs_get_bool("/gaim/gtk/conversations/chat/color_nicks")) flags |= GAIM_MESSAGE_COLORIZE; - /* Raise the window, if specified in prefs. */ - if (!(flags & GAIM_MESSAGE_NO_LOG) && - /* we may want to change this */ - gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) { - - gaim_conv_window_raise(gaim_conversation_get_window(conv)); - } - gaim_conversation_write(conv, who, message, flags, mtime); } @@ -4717,14 +4703,6 @@ win = gaim_conversation_get_window(conv); - if (!(flags & GAIM_MESSAGE_NO_LOG) && - ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT && - gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) || - (gaim_conversation_get_type(conv) == GAIM_CONV_IM && - gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) { - gaim_conv_window_show(win); - } - if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml)))) gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0); @@ -5909,7 +5887,6 @@ gaim_prefs_add_int("/gaim/gtk/conversations/chat/default_width", 410); gaim_prefs_add_int("/gaim/gtk/conversations/chat/default_height", 160); gaim_prefs_add_int("/gaim/gtk/conversations/chat/entry_height", 50); - gaim_prefs_add_bool("/gaim/gtk/conversations/chat/raise_on_events", FALSE); /* Conversations -> IM */ gaim_prefs_add_none("/gaim/gtk/conversations/im"); @@ -5919,7 +5896,6 @@ gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410); gaim_prefs_add_int("/gaim/gtk/conversations/im/default_height", 160); gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50); - gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); /* Connect callbacks. */
--- a/src/gtkprefs.c Mon Dec 13 23:12:18 2004 +0000 +++ b/src/gtkprefs.c Mon Dec 13 23:15:41 2004 +0000 @@ -899,11 +899,6 @@ "/gaim/gtk/conversations/im/animate_buddy_icons", vbox); gaim_gtk_prefs_checkbox(_("_Notify buddies that you are typing to them"), "/core/conversations/im/send_typing", vbox); - gaim_gtk_prefs_checkbox(_("_Raise IM window on events"), - "/gaim/gtk/conversations/im/raise_on_events", vbox); - - gaim_gtk_prefs_checkbox(_("Raise chat _window on events"), - "/gaim/gtk/conversations/chat/raise_on_events", vbox); /* All the tab options! */ vbox = gaim_gtk_make_frame(ret, _("Tab Options")); @@ -2361,6 +2356,8 @@ gaim_prefs_remove("/gaim/gtk/conversations/smiley_shortcuts"); gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); + gaim_prefs_remove("/gaim/gtk/conversations/im/raise_on_events"); + gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events"); gaim_prefs_remove("/gaim/gtk/sound/signon"); gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); gaim_prefs_remove("/gaim/gtk/logging/individual_logs");