pidgin: ccb8d092: Rename "availmsg" to "statusmsg" here. ...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: ccb8d092a7dafef1f0bd31ddff1d73dbf0bfe1a3
Ancestor: afd189bbc2a50acf6d5ce48f2b7ef623e06cde0e
Author: markdoliner at pidgin.im
Date: 2009-03-05T23:33:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ccb8d092a7dafef1f0bd31ddff1d73dbf0bfe1a3

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

ChangeLog: 

Rename "availmsg" to "statusmsg" here.  I think recent official AIM
clients have been putting a plaintext version of the away message
here.  AIM Lite does, at least.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_oservice.c	abd1524cb064553247040c4cc700d51ba81b7280
+++ libpurple/protocols/oscar/family_oservice.c	82852d2097d4b7d8a330ad13d11f7edbcff2e7c6
@@ -825,7 +825,7 @@ aim_srv_setextrainfo(OscarData *od,
 int
 aim_srv_setextrainfo(OscarData *od,
 		gboolean seticqstatus, guint32 icqstatus,
-		gboolean setavailmsg, const char *availmsg, const char *itmsurl)
+		gboolean setstatusmsg, const char *statusmsg, const char *itmsurl)
 {
 	FlapConnection *conn;
 	ByteStream bs;
@@ -851,16 +851,16 @@ aim_srv_setextrainfo(OscarData *od,
 	}
 #endif
 
-	if (setavailmsg)
+	if (setstatusmsg)
 	{
-		size_t availmsglen, itmsurllen;
+		size_t statusmsglen, itmsurllen;
 		ByteStream tmpbs;
 
-		availmsglen = (availmsg != NULL) ? strlen(availmsg) : 0;
+		statusmsglen = (statusmsg != NULL) ? strlen(statusmsg) : 0;
 		itmsurllen = (itmsurl != NULL) ? strlen(itmsurl) : 0;
 
-		byte_stream_new(&tmpbs, availmsglen + 8 + itmsurllen + 8);
-		byte_stream_put_bart_asset_str(&tmpbs, 0x0002, availmsg);
+		byte_stream_new(&tmpbs, statusmsglen + 8 + itmsurllen + 8);
+		byte_stream_put_bart_asset_str(&tmpbs, 0x0002, statusmsg);
 		byte_stream_put_bart_asset_str(&tmpbs, 0x0009, itmsurl);
 
 		aim_tlvlist_add_raw(&tlvlist, 0x001d,
============================================================
--- libpurple/protocols/oscar/oscar.h	53c5d93dd6fbc18a33d6eff89cdbfccc14e7b89a
+++ libpurple/protocols/oscar/oscar.h	d5ac762f9a3ce6a18c2f23da07491d6ea7d207da
@@ -665,7 +665,7 @@ void oscar_data_destroy(OscarData *);
 /* 0x0014 */ void aim_srv_setprivacyflags(OscarData *od, FlapConnection *conn, guint32);
 /* 0x0016 */ void aim_srv_nop(OscarData *od, FlapConnection *conn);
 /* 0x0017 */ void aim_srv_setversions(OscarData *od, FlapConnection *conn);
-/* 0x001e */ int aim_srv_setextrainfo(OscarData *od, gboolean seticqstatus, guint32 icqstatus, gboolean setavailmsg, const char *availmsg, const char *itmsurl);
+/* 0x001e */ int aim_srv_setextrainfo(OscarData *od, gboolean seticqstatus, guint32 icqstatus, gboolean setstatusmsg, const char *statusmsg, const char *itmsurl);
 
 
 void aim_bos_reqrights(OscarData *od, FlapConnection *conn);