Cleaning up struct im_connection a little bit.

2 files changed, 0 insertions, 18 deletions

diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index eccf77da..0536ce69 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -87,11 +87,8 @@ struct im_connection
 	GSList *deny;
 	int permdeny;
 	
-	char displayname[128];
 	char *away;
 	
-	int evil;
-	
 	/* BitlBee */
 	bee_t *bee;
 	
@@ -126,7 +123,6 @@ struct buddy {
 	char name[80];
 	char show[BUDDY_ALIAS_MAXLEN];
 	int present;
-	int evil;
 	time_t signon;
 	time_t idle;
 	int uc;
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index a5e177e9..0a1de519 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -946,9 +946,6 @@ static int gaim_parse_oncoming(aim_session_t *sess, aim_frame_t *fr, ...) {
 			g_hash_table_insert(od->ips, uin, (gpointer) (long) info->icqinfo.ipaddr);
 	}
 
-	if (!aim_sncmp(ic->acc->user, info->sn))
-		g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
-
 	tmp = normalize(info->sn);
 	imcb_buddy_status(ic, tmp, flags, state_string, NULL);
 	imcb_buddy_times(ic, tmp, signon, time_idle);
@@ -1535,17 +1532,6 @@ static int gaim_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...) {
 }
 
 static int gaim_selfinfo(aim_session_t *sess, aim_frame_t *fr, ...) {
-	va_list ap;
-	aim_userinfo_t *info;
-	struct im_connection *ic = sess->aux_data;
-
-	va_start(ap, fr);
-	info = va_arg(ap, aim_userinfo_t *);
-	va_end(ap);
-
-	ic->evil = info->warnlevel/10;
-	/* ic->correction_time = (info->onlinesince - ic->login_time); */
-
 	return 1;
 }