pidgin: 3f1be4e6: Remove some stray spaces
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Jun 17 17:11:04 EDT 2010
-----------------------------------------------------------------
Revision: 3f1be4e68646e1b8b8d32c50d6a1ec4b2be9b7d6
Ancestor: 36a2252d33b7a01e01f00ac7599f91059951e47e
Author: markdoliner at pidgin.im
Date: 2010-06-17T20:53:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3f1be4e68646e1b8b8d32c50d6a1ec4b2be9b7d6
Modified files:
libpurple/protocols/oscar/family_icbm.c
ChangeLog:
Remove some stray spaces
-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_icbm.c 52688bc864209fd4471193bfce81c4547ba8ae51
+++ libpurple/protocols/oscar/family_icbm.c 454c1eab3e803b8a00d48b3ff4b4f80a83caf866
@@ -2701,55 +2701,55 @@ static int clientautoresp(OscarData *od,
if (channel == 0x0002)
{
- hdrlen = byte_stream_getle16(bs);
- if ( ((hdrlen == 27 ) && (bs->len > (27 + 51)))) {
- byte_stream_advance(bs, 51);
- num1 = byte_stream_getle16(bs);
- num2 = byte_stream_getle16(bs);
- purple_debug_misc("oscar", "X-Status: Num1 %i, num2 %i\n",num1, num2);
-
- if(((num1 == 0x4f00)&&(num2 == 0x3b00))) {
- byte_stream_advance(bs, 86);
- curpos = byte_stream_curpos(bs);
- xml = byte_stream_getstr(bs, bs->len - curpos);
- purple_debug_misc("oscar", "X-Status: Received XML reply\n");
- if(xml) {
- /* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", (const char*) xml); */
- if ((desc=strstr(xml,"<desc>")) != NULL) {
- temp=strstr(xml,"</desc>");
- temp[0]=0;
- desc=desc+12;
- }
- if ((title=strstr(xml,"<title>")) != NULL) {
- temp=strstr(xml,"</title>");
- temp[0]=0;
- title=title+13;
- } else {
- title="";
- }
- strcpy(xml,title);
+ hdrlen = byte_stream_getle16(bs);
+ if ( ((hdrlen == 27 ) && (bs->len > (27 + 51)))) {
+ byte_stream_advance(bs, 51);
+ num1 = byte_stream_getle16(bs);
+ num2 = byte_stream_getle16(bs);
+ purple_debug_misc("oscar", "X-Status: Num1 %i, num2 %i\n",num1, num2);
+
+ if(((num1 == 0x4f00)&&(num2 == 0x3b00))) {
+ byte_stream_advance(bs, 86);
+ curpos = byte_stream_curpos(bs);
+ xml = byte_stream_getstr(bs, bs->len - curpos);
+ purple_debug_misc("oscar", "X-Status: Received XML reply\n");
+ if(xml) {
+ /* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", (const char*) xml); */
+ if ((desc=strstr(xml,"<desc>")) != NULL) {
+ temp=strstr(xml,"</desc>");
+ temp[0]=0;
+ desc=desc+12;
+ }
+ if ((title=strstr(xml,"<title>")) != NULL) {
+ temp=strstr(xml,"</title>");
+ temp[0]=0;
+ title=title+13;
+ } else {
+ title="";
+ }
+ strcpy(xml,title);
if (desc) {
- strcat(xml, " - ");
- strcat(xml, desc);
+ strcat(xml, " - ");
+ strcat(xml, desc);
}
- purple_debug_misc("oscar", "X-Status reply: %s\n", (const char*)xml);
- account = purple_connection_get_account(od->gc);
- buddy = purple_find_buddy(account, bn);
- presence = purple_buddy_get_presence(buddy);
- status = purple_presence_get_active_status(presence);
- purple_prpl_got_user_status(account, bn,
- purple_status_get_id(status), "message", xml, NULL);
- } else {
- purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
+ purple_debug_misc("oscar", "X-Status reply: %s\n", (const char*)xml);
+ account = purple_connection_get_account(od->gc);
+ buddy = purple_find_buddy(account, bn);
+ presence = purple_buddy_get_presence(buddy);
+ status = purple_presence_get_active_status(presence);
+ purple_prpl_got_user_status(account, bn,
+ purple_status_get_id(status), "message", xml, NULL);
+ } else {
+ purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
}
- } else {
- purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n" );
+ } else {
+ purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n" );
/* if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
- ret = userfunc(od, conn, frame, channel, sn, reason); */
+ ret = userfunc(od, conn, frame, channel, sn, reason); */
}
-
- }
+ }
+
} else if (channel == 0x0004) { /* ICQ message */
switch (reason) {
case 0x0003: { /* ICQ status message. Maybe other stuff too, you never know with these people. */
@@ -2930,12 +2930,12 @@ int icq_im_xstatus_request(OscarData *od
char *statxml;
int xmllen;
- static const guint8 pluginid[] =
+ static const guint8 pluginid[] =
{
- 0x09, 0x46, 0x13, 0x49, 0x4C, 0x7F, 0x11, 0xD1,
+ 0x09, 0x46, 0x13, 0x49, 0x4C, 0x7F, 0x11, 0xD1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
};
-
+
static const guint8 c_plugindata[] =
{
0x1B, 0x00, 0x0A,
@@ -2949,14 +2949,14 @@ int icq_im_xstatus_request(OscarData *od
0x72, 0x72, 0x69, 0x76, 0x65, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00
};
-
+
if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
return -EINVAL;
if (!sn)
return -EINVAL;
- fmt = "<N><QUERY><Q><PluginID>srvMng</PluginID></Q></QUERY><NOTIFY><srv><id>cAwaySrv</id><req><id>AwayStat</id><trans>2</trans><senderId>%s</senderId></req></srv></NOTIFY></N>\r\n";
+ fmt = "<N><QUERY><Q><PluginID>srvMng</PluginID></Q></QUERY><NOTIFY><srv><id>cAwaySrv</id><req><id>AwayStat</id><trans>2</trans><senderId>%s</senderId></req></srv></NOTIFY></N>\r\n";
account = purple_connection_get_account(od->gc);
xmllen = strlen(fmt) - 2 + strlen(account->username);
@@ -2970,7 +2970,7 @@ int icq_im_xstatus_request(OscarData *od
+ 2 + 2 + 8 + 16 + 2 + 2 + 2 + 2 + 2
+ 2 + 2 + sizeof(c_plugindata) + xmllen
+ 2 + 2);
-
+
snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
aim_im_puticbm(&bs, cookie, 0x0002, sn);
@@ -2980,24 +2980,23 @@ int icq_im_xstatus_request(OscarData *od
byte_stream_put16(&header, 0x0000); /* Message Type: Request */
byte_stream_putraw(&header, cookie, sizeof(cookie)); /* Message ID */
byte_stream_putraw(&header, pluginid, sizeof(pluginid)); /* Plugin ID */
-
+
aim_tlvlist_add_16(&inner_tlvlist, 0x000a, 0x0001);
aim_tlvlist_add_noval(&inner_tlvlist, 0x000f);
-
+
/* Add Plugin Specific Data */
byte_stream_putraw(&plugindata, c_plugindata, sizeof(c_plugindata)); /* Content of TLV 0x2711 */
byte_stream_putstr(&plugindata, statxml);
aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, (sizeof(c_plugindata) + xmllen), plugindata.data);
-
+
aim_tlvlist_write(&header, &inner_tlvlist);
-
-
+
aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&header), header.data);
aim_tlvlist_add_noval(&outer_tlvlist, 0x0003); /* Empty TLV 0x0003 */
-
+
aim_tlvlist_write(&bs, &outer_tlvlist);
-
+
purple_debug_misc("oscar", "X-Status Request\n");
flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs, TRUE);
@@ -3024,39 +3023,38 @@ int icq_relay_xstatus(OscarData *od, con
char *statxml;
const char *title;
int len;
-
+
static const guint8 plugindata[] = {
0x1B, 0x00,
0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4F,
- 0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0,
- 0x9C, 0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00,
- 0x00, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x50, 0x6C, 0x75,
- 0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
+ 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4F,
+ 0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0,
+ 0x9C, 0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00,
+ 0x00, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x50, 0x6C, 0x75,
+ 0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
0x69, 0x6F, 0x6E, 0x20, 0x41, 0x72, 0x72, 0x69, 0x76, 0x65, 0x00,
0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xEF, 0x01, 0x00, 0x00
- };
+ };
fmt = "<NR><RES><ret event='OnRemoteNotification'><srv><id>cAwaySrv</id><val srv_id='cAwaySrv'><Root><CASXtraSetAwayMessage></CASXtraSetAwayMessage>&l t;uin>%s</uin><index>1</index><title>%s</title><desc>%s</desc></Root></val></srv><srv><id>cRandomizerSrv</id><val srv_id='cRandomizerSrv'>undefined</val></srv></ret></RES></NR>\r\n";
-
-
+
if (!od || !(conn = flap_connection_findbygroup(od, 0x0002)))
return -EINVAL;
if (!sn)
return -EINVAL;
-
+
account = purple_connection_get_account(od->gc);
if(!account) return -EINVAL;
-
+
/* if (!strcmp(account->username, sn))
icq_im_xstatus_request(od, sn); */
-
+
status = purple_presence_get_active_status(account->presence);
if (!status) return -EINVAL;
title = purple_status_get_name(status);
@@ -3068,7 +3066,7 @@ int icq_relay_xstatus(OscarData *od, con
len = strlen(fmt)-6+strlen(account->username)+strlen(title)+strlen(msg);
statxml = (char*) g_malloc(len);
- snprintf(statxml, len, fmt,
+ snprintf(statxml, len, fmt,
account->username, title, msg);
purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
@@ -3080,7 +3078,7 @@ int icq_relay_xstatus(OscarData *od, con
byte_stream_put16(&bs, 0x0003);
byte_stream_putraw(&bs, plugindata, sizeof(plugindata));
byte_stream_putraw(&bs, (const guint8*)statxml, strlen(statxml));
-
+
flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, 0x0000, snacid, &bs, TRUE);
g_free(statxml);
More information about the Commits
mailing list