Mercurial > pidgin.yaz
comparison libpurple/notify.c @ 20957:1ec2b67e9bc1
merge of '59ab2b78429c94d5d0fc77b1b7892accb524e2a4'
and 'e440d3119d6686976d657170c1fce857f4aecfc4'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Mon, 15 Oct 2007 23:46:12 +0000 |
| parents | dd0878ccc577 |
| children | 0cbfc19e4909 73ef026191e7 |
comparison
equal
deleted
inserted
replaced
| 20942:37f3c1023a68 | 20957:1ec2b67e9bc1 |
|---|---|
| 686 } | 686 } |
| 687 | 687 |
| 688 void | 688 void |
| 689 purple_notify_user_info_remove_last_item(PurpleNotifyUserInfo *user_info) | 689 purple_notify_user_info_remove_last_item(PurpleNotifyUserInfo *user_info) |
| 690 { | 690 { |
| 691 user_info->user_info_entries = g_list_remove(user_info->user_info_entries, | 691 GList *last = g_list_last(user_info->user_info_entries); |
| 692 g_list_last(user_info->user_info_entries)->data); | 692 if (last) { |
| 693 purple_notify_user_info_entry_destroy(last->data); | |
| 694 user_info->user_info_entries = g_list_remove_link(user_info->user_info_entries, last); | |
| 695 } | |
| 693 } | 696 } |
| 694 | 697 |
| 695 void * | 698 void * |
| 696 purple_notify_uri(void *handle, const char *uri) | 699 purple_notify_uri(void *handle, const char *uri) |
| 697 { | 700 { |