Mercurial > pidgin
changeset 23220:01e1468da703
merge of '20372c17661f91b48107dadf3019a7b9123f3650'
and 'dfcb0eeaba14aea1a9730cb7c378aae53f4541a9'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 27 May 2008 04:11:04 +0000 |
| parents | 7b7af53e136a (current diff) f9ec2f2580e6 (diff) |
| children | bac674d6dcf5 ff29208e03ef |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Tue May 27 04:10:43 2008 +0000 +++ b/ChangeLog.API Tue May 27 04:11:04 2008 +0000 @@ -15,6 +15,8 @@ * purple_buddy_icons_node_find_custom_icon * purple_buddy_icons_node_set_custom_icon * purple_buddy_icons_node_set_custom_icon_from_file + * purple_notify_user_info_prepend_section_break + * purple_notify_user_info_prepend_section_header Deprecated: * purple_blist_update_buddy_icon
--- a/libpurple/notify.h Tue May 27 04:10:43 2008 +0000 +++ b/libpurple/notify.h Tue May 27 04:11:04 2008 +0000 @@ -580,6 +580,7 @@ * Prepend a section break. A UI might display this as a horizontal line. * * @param user_info The PurpleNotifyUserInfo + * @since 2.5.0 */ void purple_notify_user_info_prepend_section_break(PurpleNotifyUserInfo *user_info); @@ -596,6 +597,7 @@ * * @param user_info The PurpleNotifyUserInfo * @param label The name of the section + * @since 2.5.0 */ void purple_notify_user_info_prepend_section_header(PurpleNotifyUserInfo *user_info, const char *label);
--- a/libpurple/protocols/oscar/oscar.c Tue May 27 04:10:43 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue May 27 04:11:04 2008 +0000 @@ -2943,10 +2943,6 @@ user_info = purple_notify_user_info_new(); purple_notify_user_info_add_pair(user_info, _("Username"), userinfo->sn); - tmp = g_strdup_printf("%d", (int)((userinfo->warnlevel/10.0) + 0.5)); - purple_notify_user_info_add_pair(user_info, _("Warning Level"), tmp); - g_free(tmp); - if (userinfo->present & AIM_USERINFO_PRESENT_ONLINESINCE) { time_t t = userinfo->onlinesince; oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));