Mercurial > pidgin
comparison src/gtkpounce.c @ 13033:69b3d5cbd2b1
[gaim-migrate @ 15389]
Kill gaim_date() and gaim_date_full(). The former isn't used and the latter is used only twice. This makes the buddy pounce pop-ups and debug log headers contain localized dates, fixing part of SF Bug #1325915. Thanks to Bleeter for discovering that gaim_date() isn't used.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 25 Jan 2006 02:58:54 +0000 |
parents | c6a202e5823b |
children | 0aa231ebbfd5 |
comparison
equal
deleted
inserted
replaced
13032:4016a35bdd4d | 13033:69b3d5cbd2b1 |
---|---|
1430 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); | 1430 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); |
1431 } | 1431 } |
1432 | 1432 |
1433 if (gaim_pounce_action_is_enabled(pounce, "popup-notify")) | 1433 if (gaim_pounce_action_is_enabled(pounce, "popup-notify")) |
1434 { | 1434 { |
1435 time_t now = time(NULL); | |
1436 char date[64]; | |
1435 char *tmp; | 1437 char *tmp; |
1436 const char *name_shown; | 1438 const char *name_shown; |
1437 const char *reason; | 1439 const char *reason; |
1438 reason = gaim_pounce_action_get_attribute(pounce, "popup-notify", | 1440 reason = gaim_pounce_action_get_attribute(pounce, "popup-notify", |
1439 "reason"); | 1441 "reason"); |
1470 * name if that's all we have | 1472 * name if that's all we have |
1471 */ | 1473 */ |
1472 if ((name_shown = gaim_account_get_alias(account)) == NULL) | 1474 if ((name_shown = gaim_account_get_alias(account)) == NULL) |
1473 name_shown = gaim_account_get_username(account); | 1475 name_shown = gaim_account_get_username(account); |
1474 | 1476 |
1477 strftime(date, sizeof(date), "%c", localtime(&now)); | |
1475 if (reason == NULL) | 1478 if (reason == NULL) |
1476 gaim_notify_info(NULL, name_shown, tmp, gaim_date_full()); | 1479 gaim_notify_info(NULL, name_shown, tmp, date); |
1477 else | 1480 else |
1478 { | 1481 { |
1479 char *tmp2 = g_strdup_printf("%s\n\n%s", reason, gaim_date_full()); | 1482 char *tmp2 = g_strdup_printf("%s\n\n%s", reason, date); |
1480 gaim_notify_info(NULL, name_shown, tmp, tmp2); | 1483 gaim_notify_info(NULL, name_shown, tmp, tmp2); |
1481 g_free(tmp2); | 1484 g_free(tmp2); |
1482 } | 1485 } |
1483 g_free(tmp); | 1486 g_free(tmp); |
1484 } | 1487 } |