Mercurial > pidgin
diff src/conversation.c @ 9150:05532ad61ed5
[gaim-migrate @ 9934]
recommit sean's prefs changes as promised, i'll look at the underscores
tomorrow
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Mon, 31 May 2004 03:38:47 +0000 |
parents | 6ea36eac6f22 |
children | e0c50af60837 |
line wrap: on
line diff
--- a/src/conversation.c Mon May 31 01:39:09 2004 +0000 +++ b/src/conversation.c Mon May 31 03:38:47 2004 +0000 @@ -2263,10 +2263,14 @@ { 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(); @@ -2354,9 +2358,7 @@ group2 = conv_get_group(conv2); - if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") || - type == gaim_conversation_get_type(conv2)) && - group == group2) + if (group == group2) { gaim_conv_window_add_conversation(win2, conv); @@ -2394,9 +2396,7 @@ { conv2 = (GaimConversation *)convs->data; - if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") || - type == gaim_conversation_get_type(conv2)) && - account == gaim_conversation_get_account(conv2)) + if (account == gaim_conversation_get_account(conv2)) { gaim_conv_window_add_conversation(win2, conv); return; @@ -2408,6 +2408,8 @@ conv_placement_new_window(conv); } +#if 0 /* I don't like this */ + static void conv_placement_by_number(GaimConversation *conv) { @@ -2449,6 +2451,8 @@ } } +#endif + static ConvPlacementData * get_conv_placement_data(const char *id) { @@ -2492,8 +2496,6 @@ 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); } }