Mercurial > pidgin3 / file diff

--- a/src/protocols/oscar/oscar.c	Sat Nov 12 14:10:07 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Nov 12 15:19:24 2005 +0000
@@ -3061,11 +3061,8 @@
 
 static int gaim_parse_login(aim_session_t *sess, aim_frame_t *fr, ...) {
 	GaimConnection *gc = sess->aux_data;
-	OscarData *od = gc->proto_data;
 	GaimAccount *account = gaim_connection_get_account(gc);
-#if 0
-	struct client_info_s info = {"gaim", 7, 3, 2003, "us", "en", 0x0004, 0x0000, 0x04b};
-#endif
+	struct client_info_s info = CLIENTINFO_GAIM;
 	va_list ap;
 	char *key;
 
@@ -3073,15 +3070,8 @@
 	key = va_arg(ap, char *);
 	va_end(ap);
 
-	if (od->icq) {
-		struct client_info_s info = CLIENTINFO_ICQ_KNOWNGOOD;
-		aim_send_login(sess, fr->conn, gaim_account_get_username(account),
-					   gaim_connection_get_password(gc), &info, key);
-	} else {
-		struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
-		aim_send_login(sess, fr->conn, gaim_account_get_username(account),
-					   gaim_connection_get_password(gc), &info, key);
-	}
+	aim_send_login(sess, fr->conn, gaim_account_get_username(account),
+				   gaim_connection_get_password(gc), &info, key);
 
 	gaim_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
 	ck[2] = 0x6c;