[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.173,1.174 oscar.c,1.808,1.809

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30110

Modified Files:
	aim.h oscar.c 
Log Message:
Identify Gaim as "Gaim" instead of claiming to be the AIM or ICQ clients.
Justin Uberti said we should do this.  Although, I can't seem to find
the blog entry where he mentioned it...

We'll see how it goes.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -p -r1.173 -r1.174
--- aim.h	1 Sep 2005 02:29:05 -0000	1.173
+++ aim.h	12 Nov 2005 15:19:24 -0000	1.174
@@ -277,11 +277,20 @@ struct client_info_s {
 	"us", "en", \
 }
 
+#define CLIENTINFO_GAIM { \
+	"Gaim", \
+	0xf001, \
+	GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION, \
+	GAIM_MINOR_VERSION, 0x0000, \
+	0x00000000, \
+	"us", "en", \
+}
+
 #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036
 #define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQ_5_45_3777
 
-/* 
- * These could be arbitrary, but its easier to use the actual AIM values 
+/*
+ * These could be arbitrary, but its easier to use the actual AIM values
  */
 #define AIM_CONN_TYPE_BOS		0x0002
 #define AIM_CONN_TYPE_ADS		0x0005

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -d -p -r1.808 -r1.809
--- oscar.c	7 Nov 2005 03:44:30 -0000	1.808
+++ oscar.c	12 Nov 2005 15:19:24 -0000	1.809
@@ -3061,11 +3061,8 @@ int gaim_memrequest(aim_session_t *sess,
 
 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 @@ static int gaim_parse_login(aim_session_
 	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;