pidgin: b507bb1d: Minor cleanup: remove od->sn, since it's...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Dec 7 18:36:51 EST 2008
-----------------------------------------------------------------
Revision: b507bb1dedd2667cc4560ab1785454614ae4fce4
Ancestor: 4ff028813f413133586393038d63ee3d565450a5
Author: markdoliner at pidgin.im
Date: 2008-12-07T23:34:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b507bb1dedd2667cc4560ab1785454614ae4fce4
Modified files:
libpurple/protocols/oscar/bstream.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/family_icbm.c
libpurple/protocols/oscar/family_icq.c
libpurple/protocols/oscar/oscar.h
ChangeLog:
Minor cleanup: remove od->sn, since it's the same as PurpleAccount->username
-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/bstream.c f45c93484941cfd334b3d42d577c4cb8f3ace17f
+++ libpurple/protocols/oscar/bstream.c 103f791a9418375427bbfcf3e4942c2813827e94
@@ -302,3 +302,12 @@ int byte_stream_putbs(ByteStream *bs, By
return len;
}
+
+int byte_stream_putuid(ByteStream *bs, OscarData *od)
+{
+ PurpleAccount *account;
+
+ account = purple_connection_get_account(od->gc);
+
+ return byte_stream_putle32(bs, atoi(purple_account_get_username(account)));
+}
============================================================
--- libpurple/protocols/oscar/family_auth.c 83e740ae17078bc10989614344ea50a985722944
+++ libpurple/protocols/oscar/family_auth.c b8dc8289b1075f6d7851f730a0d7365801152d0b
@@ -295,10 +295,9 @@ parse(OscarData *od, FlapConnection *con
/*
* No matter what, we should have a screen name.
*/
- memset(od->sn, 0, sizeof(od->sn));
if (aim_tlv_gettlv(tlvlist, 0x0001, 1)) {
info->sn = aim_tlv_getstr(tlvlist, 0x0001, 1);
- strncpy(od->sn, info->sn, sizeof(od->sn));
+ purple_connection_set_display_name(od->gc, info->sn);
}
/*
============================================================
--- libpurple/protocols/oscar/family_icbm.c ffadc235ea5229783fcc3cf7f92b5abd8e26dd6d
+++ libpurple/protocols/oscar/family_icbm.c 80ce9708420fc9a68491d504ae265384ff5a63c9
@@ -1214,7 +1214,7 @@ int aim_im_sendch4(OscarData *od, const
/*
* Your UIN
*/
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
/*
* TLV t(type) l(strlen(message)+1) v(message+NULL)
============================================================
--- libpurple/protocols/oscar/family_icq.c 74097caf4eed26691dbdc32cb47a2befb04d8ca7
+++ libpurple/protocols/oscar/family_icq.c cd0b662e0a1e8878351948e4724f7ebb18c201d9
@@ -36,7 +36,7 @@ int aim_icq_reqofflinemsgs(OscarData *od
if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
return -EINVAL;
- purple_debug_info("oscar", "Requesting offline messages from %s", od->sn);
+ purple_debug_info("oscar", "Requesting offline messages\n");
bslen = 2 + 4 + 2 + 2;
@@ -49,7 +49,7 @@ int aim_icq_reqofflinemsgs(OscarData *od
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x003c); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
@@ -70,7 +70,7 @@ int aim_icq_ackofflinemsgs(OscarData *od
if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
return -EINVAL;
- purple_debug_info("oscar", "Acknowledged receipt of offline messages from %s", od->sn);
+ purple_debug_info("oscar", "Acknowledged receipt of offline messages\n");
bslen = 2 + 4 + 2 + 2;
@@ -83,7 +83,7 @@ int aim_icq_ackofflinemsgs(OscarData *od
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x003e); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
@@ -117,7 +117,7 @@ aim_icq_setsecurity(OscarData *od, gbool
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x0c3a); /* shrug. */
@@ -172,7 +172,7 @@ int aim_icq_changepasswd(OscarData *od,
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x042e); /* shrug. */
@@ -212,7 +212,7 @@ int aim_icq_getallinfo(OscarData *od, co
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x04b2); /* shrug. */
@@ -259,7 +259,7 @@ int aim_icq_getalias(OscarData *od, cons
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x04ba); /* shrug. */
@@ -303,7 +303,7 @@ int aim_icq_getsimpleinfo(OscarData *od,
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x051f); /* shrug. */
@@ -341,7 +341,7 @@ int aim_icq_sendxmlreq(OscarData *od, co
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x0998); /* shrug. */
@@ -377,11 +377,12 @@ int aim_icq_sendsms(OscarData *od, const
int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char *alias)
{
FlapConnection *conn;
+ PurpleAccount *account;
ByteStream bs;
aim_snacid_t snacid;
int bslen, xmllen;
char *xml;
- const char *timestr;
+ const char *timestr, *username;
time_t t;
struct tm *tm;
gchar *stripped;
@@ -392,6 +393,9 @@ int aim_icq_sendsms(OscarData *od, const
if (!name || !msg || !alias)
return -EINVAL;
+ account = purple_connection_get_account(od->gc);
+ username = purple_account_get_username(account);
+
time(&t);
tm = gmtime(&t);
timestr = purple_utf8_strftime("%a, %d %b %Y %T %Z", tm);
@@ -399,7 +403,7 @@ int aim_icq_sendsms(OscarData *od, const
stripped = purple_markup_strip_html(msg);
/* The length of xml included the null terminating character */
- xmllen = 209 + strlen(name) + strlen(stripped) + strlen(od->sn) + strlen(alias) + strlen(timestr) + 1;
+ xmllen = 209 + strlen(name) + strlen(stripped) + strlen(username) + strlen(alias) + strlen(timestr) + 1;
xml = g_new(char, xmllen);
snprintf(xml, xmllen, "<icq_sms_message>"
@@ -411,7 +415,7 @@ int aim_icq_sendsms(OscarData *od, const
"<delivery_receipt>Yes</delivery_receipt>"
"<time>%s</time>"
"</icq_sms_message>",
- name, stripped, od->sn, alias, timestr);
+ name, stripped, username, alias, timestr);
bslen = 36 + xmllen;
@@ -424,7 +428,7 @@ int aim_icq_sendsms(OscarData *od, const
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
@@ -481,7 +485,7 @@ int aim_icq_getstatusnote(OscarData *od,
byte_stream_put16(&bs, bslen);
byte_stream_putle16(&bs, bslen - 2);
- byte_stream_putle32(&bs, atoi(od->sn));
+ byte_stream_putuid(&bs, od);
byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
byte_stream_putle16(&bs, snacid); /* eh. */
byte_stream_putle16(&bs, 0x0fa0); /* shrug. */
============================================================
--- libpurple/protocols/oscar/oscar.h 0b3efb1e5875bcfb27daa458b8e7f020a6556c36
+++ libpurple/protocols/oscar/oscar.h de5f3e4d647f8d1aa4ce2ad067901849dce40970
@@ -488,16 +488,8 @@ struct _OscarData
guint maxawaymsglen; /* max size (bytes) of posted away message */
} rights;
- /* ---- Client Accessible ------------------------ */
-
- /* Our screen name. */
- /* TODO: Get rid of this and use purple_account_get_username() everywhere? */
- char sn[MAXSNLEN+1];
-
PurpleConnection *gc;
- /* ---- Internal Use Only ------------------------ */
-
void *modlistv;
/*
@@ -1587,6 +1579,7 @@ int byte_stream_putbs(ByteStream *bs, By
int byte_stream_putraw(ByteStream *bs, const guint8 *v, int len);
int byte_stream_putstr(ByteStream *bs, const char *str);
int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len);
+int byte_stream_putuid(ByteStream *bs, OscarData *od);
int byte_stream_putcaps(ByteStream *bs, guint32 caps);
/*
More information about the Commits
mailing list