cpw.rekkanoryo.icqxstatus: 3b380403: Some code got duplicated during merge...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 3b3804039eb91585981ca7ea599299577dc3762d
Ancestor: eb3589c570410b499c6c861f3e619926d2cf2a75
Author: malu at pidgin.im
Date: 2010-02-09T20:14:10
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/3b3804039eb91585981ca7ea599299577dc3762d

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Some code got duplicated during merge...

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	914148e71ed2164626cee69852b9c5a9e1ffc183
+++ libpurple/protocols/oscar/oscar.c	a186f3b5bb2c871286f635024432fbd3254eaf89
@@ -6199,8 +6199,6 @@ const char *oscar_list_emblem(PurpleBudd
 			return "admin";
 		if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY)
 			return "bot";
-		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
-			return "hiptop";
 		if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)
 			return "secure";
 		if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY)