merge of '80674683d0bc8c468e58719d865eac65a3ca55ca'

Tue, 27 May 2008 03:47:16 +0000

author
Evan Schoenberg <evands@pidgin.im>
date
Tue, 27 May 2008 03:47:16 +0000
changeset 23362
23daac861b2e
parent 23360
80674683d0bc (current diff)
parent 23361
73a6f9b651fe (diff)
child 23363
bd5f7f61d934

merge of '80674683d0bc8c468e58719d865eac65a3ca55ca'
and '73a6f9b651fe8afd4128954fdc72127e93c95de3'

--- 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)));

mercurial