# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211861464 0
# Node ID 01e1468da7034bb8f9b0d2f4a844b78940a909a4
# Parent  7b7af53e136a67bf92bca566d876be5494b2a75d# Parent  f9ec2f2580e658fcfdbc9794b5a0515d21c1a83e
merge of '20372c17661f91b48107dadf3019a7b9123f3650'
     and 'dfcb0eeaba14aea1a9730cb7c378aae53f4541a9'

diff -r 7b7af53e136a -r 01e1468da703 ChangeLog.API
--- 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
diff -r 7b7af53e136a -r 01e1468da703 libpurple/notify.h
--- 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);
 	
diff -r 7b7af53e136a -r 01e1468da703 libpurple/protocols/oscar/oscar.c
--- 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)));