[Gaim-commits] CVS: gaim/src/protocols/oscar conn.c,1.28,1.29 im.c,1.49,1.50 oscar.c,1.480,1.481

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

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv8148/src/protocols/oscar

Modified Files:
	conn.c im.c oscar.c 
Log Message:
I renamed struct oscar_data to typdef OscarData, which makes 
this a freaking huge change to oscar.c

I think I added another progress meter step, giving oscar a 
total of 8.

And a patch from Siberion (siberion): 
Moving the mouse cursor over an ICQ buddy whose IP is 
visible will show negative numbers in the IP for any 
parts that exceed 127.

Example: 12.-37.-16.X
With the path applied, this shows as: 12.219.240.X


Index: conn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/conn.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -p -r1.28 -r1.29
--- conn.c	16 Oct 2003 06:12:43 -0000	1.28
+++ conn.c	16 Oct 2003 20:57:59 -0000	1.29
@@ -1054,5 +1054,8 @@ faim_export int aim_flap_nop(aim_session
 
 	aim_tx_enqueue(sess, fr);
 
+	/* clean out SNACs over 60sec old */
+	aim_cleansnacs(sess, 60);
+
 	return 0;
 }

Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -p -r1.49 -r1.50
--- im.c	16 Oct 2003 06:12:43 -0000	1.49
+++ im.c	16 Oct 2003 20:57:59 -0000	1.50
@@ -389,9 +389,8 @@ faim_export int aim_im_sendch1_ext(aim_s
 
 	aim_tx_enqueue(sess, fr);
 
-	/* Move this to receive aim_flap_nop and send aim_flap_nop */
-	if (!(sess->flags & AIM_SESS_FLAGS_DONTTIMEOUTONICBM))
-		aim_cleansnacs(sess, 60); /* clean out SNACs over 60sec old */
+	/* clean out SNACs over 60sec old */
+	aim_cleansnacs(sess, 60);
 
 	return 0;
 }

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -d -p -r1.480 -r1.481
--- oscar.c	16 Oct 2003 06:12:43 -0000	1.480
+++ oscar.c	16 Oct 2003 20:57:59 -0000	1.481
@@ -55,6 +55,8 @@
 
 #define AIMHASHDATA "http://gaim.sourceforge.net/aim_data.php3"
 
+#define OSCAR_CONNECT_STEPS 6
+
 static GaimPlugin *my_protocol = NULL;
 
 static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_DIRECTIM | AIM_CAPS_SENDFILE | AIM_CAPS_INTEROPERATE;
@@ -63,7 +65,8 @@ static int caps_icq = AIM_CAPS_BUDDYICON
 static fu8_t features_aim[] = {0x01, 0x01, 0x01, 0x02};
 static fu8_t features_icq[] = {0x01, 0x06};
[...995 lines suppressed...]
 	GList *m = NULL;
 
@@ -6499,7 +6506,7 @@ static GList *oscar_actions(GaimConnecti
 
 static void oscar_change_passwd(GaimConnection *gc, const char *old, const char *new)
 {
-	struct oscar_data *od = gc->proto_data;
+	OscarData *od = gc->proto_data;
 
 	if (od->icq) {
 		aim_icq_changepasswd(od->sess, new);
@@ -6518,7 +6525,7 @@ static void oscar_change_passwd(GaimConn
 
 static void oscar_convo_closed(GaimConnection *gc, const char *who)
 {
-	struct oscar_data *od = gc->proto_data;
+	OscarData *od = gc->proto_data;
 	struct direct_im *dim = find_direct_im(od, who);
 
 	if (!dim)