# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211860036 0
# Node ID f9ec2f2580e658fcfdbc9794b5a0515d21c1a83e
# Parent  0f7aca3ed899473c14ae94b76e437bd6c7aa34f2# Parent  8fa7631158caaed4c041b34d8d998a17f327ec7b
merge of 'd5bcb8334771f0dbd5870944a8eec88f586e0fd0'
     and 'e7b26e4ad289cb60bb72e4ddb99a5a93c1fbefc9'

diff -r 0f7aca3ed899 -r f9ec2f2580e6 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue May 27 03:45:02 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue May 27 03:47:16 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)));