comparison: libpurple/purplenotification.c
libpurple/purplenotification.c
- changeset 42805
- 3e77e81168a5
- parent 42767
- 8cf1d11b59c1
- child 42909
- 440ed16de928
equal
deleted
inserted
replaced
| 42804:be8c8b5471ca | 42805:3e77e81168a5 |
|---|---|
| 499 | 499 |
| 500 PurpleNotification * | 500 PurpleNotification * |
| 501 purple_notification_new_from_add_contact_request(PurpleAddContactRequest *request) | 501 purple_notification_new_from_add_contact_request(PurpleAddContactRequest *request) |
| 502 { | 502 { |
| 503 PurpleAccount *account = NULL; | 503 PurpleAccount *account = NULL; |
| 504 PurpleContactInfo *info = NULL; | |
| 505 PurpleNotification *notification = NULL; | 504 PurpleNotification *notification = NULL; |
| 506 char *title = NULL; | 505 char *title = NULL; |
| 507 const char *alias = NULL; | 506 const char *alias = NULL; |
| 508 const char *username = NULL; | 507 const char *username = NULL; |
| 509 | 508 |
| 510 g_return_val_if_fail(PURPLE_IS_ADD_CONTACT_REQUEST(request), NULL); | 509 g_return_val_if_fail(PURPLE_IS_ADD_CONTACT_REQUEST(request), NULL); |
| 511 | 510 |
| 512 account = purple_add_contact_request_get_account(request); | 511 account = purple_add_contact_request_get_account(request); |
| 513 info = PURPLE_CONTACT_INFO(account); | |
| 514 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_ADD_CONTACT, | 512 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_ADD_CONTACT, |
| 515 account, request, g_object_unref); | 513 account, request, g_object_unref); |
| 516 | 514 |
| 517 username = purple_add_contact_request_get_username(request); | 515 username = purple_add_contact_request_get_username(request); |
| 518 alias = purple_add_contact_request_get_alias(request); | 516 alias = purple_add_contact_request_get_alias(request); |
| 519 | 517 |
| 520 if(alias != NULL && *alias != '\0') { | 518 if(alias != NULL && *alias != '\0') { |
| 521 title = g_strdup_printf(_("%s (%s) added %s to their contact list"), | 519 title = g_strdup_printf(_("%s (%s) added %s to their contact list"), |
| 522 alias, username, | 520 alias, username, |
| 523 purple_contact_info_get_username(info)); | 521 purple_account_get_username(account)); |
| 524 } else { | 522 } else { |
| 525 title = g_strdup_printf(_("%s added %s to their contact list"), | 523 title = g_strdup_printf(_("%s added %s to their contact list"), |
| 526 username, | 524 username, |
| 527 purple_contact_info_get_username(info)); | 525 purple_account_get_username(account)); |
| 528 } | 526 } |
| 529 | 527 |
| 530 purple_notification_set_title(notification, title); | 528 purple_notification_set_title(notification, title); |
| 531 g_free(title); | 529 g_free(title); |
| 532 | 530 |
| 535 | 533 |
| 536 PurpleNotification * | 534 PurpleNotification * |
| 537 purple_notification_new_from_authorization_request(PurpleAuthorizationRequest *authorization_request) | 535 purple_notification_new_from_authorization_request(PurpleAuthorizationRequest *authorization_request) |
| 538 { | 536 { |
| 539 PurpleAccount *account = NULL; | 537 PurpleAccount *account = NULL; |
| 540 PurpleContactInfo *info = NULL; | |
| 541 PurpleNotification *notification = NULL; | 538 PurpleNotification *notification = NULL; |
| 542 char *title = NULL; | 539 char *title = NULL; |
| 543 const char *alias = NULL; | 540 const char *alias = NULL; |
| 544 const char *username = NULL; | 541 const char *username = NULL; |
| 545 | 542 |
| 546 g_return_val_if_fail(PURPLE_IS_AUTHORIZATION_REQUEST(authorization_request), | 543 g_return_val_if_fail(PURPLE_IS_AUTHORIZATION_REQUEST(authorization_request), |
| 547 NULL); | 544 NULL); |
| 548 | 545 |
| 549 account = purple_authorization_request_get_account(authorization_request); | 546 account = purple_authorization_request_get_account(authorization_request); |
| 550 info = PURPLE_CONTACT_INFO(account); | |
| 551 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_AUTHORIZATION_REQUEST, | 547 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_AUTHORIZATION_REQUEST, |
| 552 account, authorization_request, | 548 account, authorization_request, |
| 553 g_object_unref); | 549 g_object_unref); |
| 554 | 550 |
| 555 username = purple_authorization_request_get_username(authorization_request); | 551 username = purple_authorization_request_get_username(authorization_request); |
| 557 | 553 |
| 558 if(alias != NULL && *alias != '\0') { | 554 if(alias != NULL && *alias != '\0') { |
| 559 title = g_strdup_printf(_("%s (%s) would like to add %s to their" | 555 title = g_strdup_printf(_("%s (%s) would like to add %s to their" |
| 560 " contact list"), | 556 " contact list"), |
| 561 alias, username, | 557 alias, username, |
| 562 purple_contact_info_get_username(info)); | 558 purple_account_get_username(account)); |
| 563 } else { | 559 } else { |
| 564 title = g_strdup_printf(_("%s would like to add %s to their contact" | 560 title = g_strdup_printf(_("%s would like to add %s to their contact" |
| 565 " list"), | 561 " list"), |
| 566 username, | 562 username, |
| 567 purple_contact_info_get_username(info)); | 563 purple_account_get_username(account)); |
| 568 } | 564 } |
| 569 | 565 |
| 570 purple_notification_set_title(notification, title); | 566 purple_notification_set_title(notification, title); |
| 571 g_free(title); | 567 g_free(title); |
| 572 | 568 |
| 587 | 583 |
| 588 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_CONNECTION_ERROR, | 584 notification = purple_notification_new(PURPLE_NOTIFICATION_TYPE_CONNECTION_ERROR, |
| 589 account, info, NULL); | 585 account, info, NULL); |
| 590 | 586 |
| 591 /* Set the title of the notification. */ | 587 /* Set the title of the notification. */ |
| 592 username = purple_contact_info_get_username(PURPLE_CONTACT_INFO(account)); | 588 username = purple_account_get_username(account); |
| 593 if(purple_account_get_enabled(account)) { | 589 if(purple_account_get_enabled(account)) { |
| 594 title = g_strdup_printf(_("%s disconnected"), username); | 590 title = g_strdup_printf(_("%s disconnected"), username); |
| 595 } else { | 591 } else { |
| 596 title = g_strdup_printf(_("%s disabled"), username); | 592 title = g_strdup_printf(_("%s disabled"), username); |
| 597 } | 593 } |
