Mercurial > pidgin
diff src/conversation.c @ 9123:6ea36eac6f22
[gaim-migrate @ 9900]
(12:38:12) Me: i did try to contact you before i reverted it the first time
(12:38:28) seanegn: I know. I've been real unavailable of late.
(12:39:51) Me: i'll tell you what i'm going to do then. i'm going to pull
that, tag, and then put it back in after we get the tarballs made
(12:39:57) Me: cause i do like the changes, just not the timing
(12:42:16) seanegn: oh, of course. Everything I do is awesome.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sun, 30 May 2004 16:44:45 +0000 |
parents | 6a17b7e2e3b2 |
children | 05532ad61ed5 |
line wrap: on
line diff
--- a/src/conversation.c Sun May 30 14:19:19 2004 +0000 +++ b/src/conversation.c Sun May 30 16:44:45 2004 +0000 @@ -2263,14 +2263,10 @@ { GaimConvWindow *win; -#if 0 /* Last-minute prefslash */ if (gaim_prefs_get_bool("/core/conversations/combine_chat_im")) win = g_list_last(gaim_get_windows())->data; else win = gaim_get_last_window_with_type(gaim_conversation_get_type(conv)); -#else - win = g_list_last(gaim_get_windows())->data; -#endif if (win == NULL) { win = gaim_conv_window_new(); @@ -2358,7 +2354,9 @@ group2 = conv_get_group(conv2); - if (group == group2) + if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") || + type == gaim_conversation_get_type(conv2)) && + group == group2) { gaim_conv_window_add_conversation(win2, conv); @@ -2396,7 +2394,9 @@ { conv2 = (GaimConversation *)convs->data; - if (account == gaim_conversation_get_account(conv2)) + if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") || + type == gaim_conversation_get_type(conv2)) && + account == gaim_conversation_get_account(conv2)) { gaim_conv_window_add_conversation(win2, conv); return; @@ -2408,8 +2408,6 @@ conv_placement_new_window(conv); } -#if 0 /* I don't like this */ - static void conv_placement_by_number(GaimConversation *conv) { @@ -2451,8 +2449,6 @@ } } -#endif - static ConvPlacementData * get_conv_placement_data(const char *id) { @@ -2496,6 +2492,8 @@ conv_placement_by_group); add_conv_placement_fnc("account", _("By account"), conv_placement_by_account); + add_conv_placement_fnc("number", _("By conversation count"), + conv_placement_by_number); } }