comparison: pidgin/gtkpounce.c
pidgin/gtkpounce.c
- branch
- release-2.x.y
- changeset 33782
- 1690e0b2c508
- parent 31321
- 1fef3832cfa2
- child 33794
- 716cbef8d1c6
equal
deleted
inserted
replaced
| 33780:401c01066268 | 33782:1690e0b2c508 |
|---|---|
| 1417 } | 1417 } |
| 1418 | 1418 |
| 1419 if (purple_pounce_action_is_enabled(pounce, "popup-notify")) | 1419 if (purple_pounce_action_is_enabled(pounce, "popup-notify")) |
| 1420 { | 1420 { |
| 1421 char *tmp; | 1421 char *tmp; |
| 1422 const char *name_shown; | |
| 1423 const char *reason; | 1422 const char *reason; |
| 1424 reason = purple_pounce_action_get_attribute(pounce, "popup-notify", | 1423 reason = purple_pounce_action_get_attribute(pounce, "popup-notify", |
| 1425 "reason"); | 1424 "reason"); |
| 1426 | 1425 |
| 1427 /* | 1426 /* |
| 1450 (events & PURPLE_POUNCE_MESSAGE_RECEIVED) ? | 1449 (events & PURPLE_POUNCE_MESSAGE_RECEIVED) ? |
| 1451 _("Sent a message") : | 1450 _("Sent a message") : |
| 1452 _("Unknown.... Please report this!") | 1451 _("Unknown.... Please report this!") |
| 1453 ); | 1452 ); |
| 1454 | 1453 |
| 1455 /* | |
| 1456 * Ok here is where I change the second argument, title, from | |
| 1457 * NULL to the account alias if we have it or the account | |
| 1458 * name if that's all we have | |
| 1459 */ | |
| 1460 if ((name_shown = purple_account_get_alias(account)) == NULL) | |
| 1461 name_shown = purple_account_get_username(account); | |
| 1462 | |
| 1463 pidgin_notify_pounce_add(account, pounce, alias, tmp, reason, | 1454 pidgin_notify_pounce_add(account, pounce, alias, tmp, reason, |
| 1464 purple_date_format_full(NULL)); | 1455 purple_date_format_full(NULL)); |
| 1465 | 1456 |
| 1466 g_free(tmp); | 1457 g_free(tmp); |
| 1467 } | 1458 } |
