comparison 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
comparison
equal deleted inserted replaced
9122:a1adaeee5b9e 9123:6ea36eac6f22
2261 static void 2261 static void
2262 conv_placement_last_created_win(GaimConversation *conv) 2262 conv_placement_last_created_win(GaimConversation *conv)
2263 { 2263 {
2264 GaimConvWindow *win; 2264 GaimConvWindow *win;
2265 2265
2266 #if 0 /* Last-minute prefslash */
2267 if (gaim_prefs_get_bool("/core/conversations/combine_chat_im")) 2266 if (gaim_prefs_get_bool("/core/conversations/combine_chat_im"))
2268 win = g_list_last(gaim_get_windows())->data; 2267 win = g_list_last(gaim_get_windows())->data;
2269 else 2268 else
2270 win = gaim_get_last_window_with_type(gaim_conversation_get_type(conv)); 2269 win = gaim_get_last_window_with_type(gaim_conversation_get_type(conv));
2271 #else
2272 win = g_list_last(gaim_get_windows())->data;
2273 #endif
2274 2270
2275 if (win == NULL) { 2271 if (win == NULL) {
2276 win = gaim_conv_window_new(); 2272 win = gaim_conv_window_new();
2277 2273
2278 gaim_conv_window_add_conversation(win, conv); 2274 gaim_conv_window_add_conversation(win, conv);
2356 { 2352 {
2357 conv2 = (GaimConversation *)cl->data; 2353 conv2 = (GaimConversation *)cl->data;
2358 2354
2359 group2 = conv_get_group(conv2); 2355 group2 = conv_get_group(conv2);
2360 2356
2361 if (group == group2) 2357 if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") ||
2358 type == gaim_conversation_get_type(conv2)) &&
2359 group == group2)
2362 { 2360 {
2363 gaim_conv_window_add_conversation(win2, conv); 2361 gaim_conv_window_add_conversation(win2, conv);
2364 2362
2365 return; 2363 return;
2366 } 2364 }
2394 convs != NULL; 2392 convs != NULL;
2395 convs = convs->next) 2393 convs = convs->next)
2396 { 2394 {
2397 conv2 = (GaimConversation *)convs->data; 2395 conv2 = (GaimConversation *)convs->data;
2398 2396
2399 if (account == gaim_conversation_get_account(conv2)) 2397 if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") ||
2398 type == gaim_conversation_get_type(conv2)) &&
2399 account == gaim_conversation_get_account(conv2))
2400 { 2400 {
2401 gaim_conv_window_add_conversation(win2, conv); 2401 gaim_conv_window_add_conversation(win2, conv);
2402 return; 2402 return;
2403 } 2403 }
2404 } 2404 }
2405 } 2405 }
2406 2406
2407 /* Make a new window. */ 2407 /* Make a new window. */
2408 conv_placement_new_window(conv); 2408 conv_placement_new_window(conv);
2409 } 2409 }
2410
2411 #if 0 /* I don't like this */
2412 2410
2413 static void 2411 static void
2414 conv_placement_by_number(GaimConversation *conv) 2412 conv_placement_by_number(GaimConversation *conv)
2415 { 2413 {
2416 GaimConvWindow *win = NULL; 2414 GaimConvWindow *win = NULL;
2448 gaim_conv_window_add_conversation(win, conv); 2446 gaim_conv_window_add_conversation(win, conv);
2449 gaim_conv_window_show(win); 2447 gaim_conv_window_show(win);
2450 } 2448 }
2451 } 2449 }
2452 } 2450 }
2453
2454 #endif
2455 2451
2456 static ConvPlacementData * 2452 static ConvPlacementData *
2457 get_conv_placement_data(const char *id) 2453 get_conv_placement_data(const char *id)
2458 { 2454 {
2459 ConvPlacementData *data = NULL; 2455 ConvPlacementData *data = NULL;
2494 conv_placement_new_window); 2490 conv_placement_new_window);
2495 add_conv_placement_fnc("group", _("By group"), 2491 add_conv_placement_fnc("group", _("By group"),
2496 conv_placement_by_group); 2492 conv_placement_by_group);
2497 add_conv_placement_fnc("account", _("By account"), 2493 add_conv_placement_fnc("account", _("By account"),
2498 conv_placement_by_account); 2494 conv_placement_by_account);
2495 add_conv_placement_fnc("number", _("By conversation count"),
2496 conv_placement_by_number);
2499 } 2497 }
2500 } 2498 }
2501 2499
2502 GList * 2500 GList *
2503 gaim_conv_placement_get_options(void) 2501 gaim_conv_placement_get_options(void)