Mercurial > pidgin.yaz
changeset 10157:0de7eee583e6
[gaim-migrate @ 11237]
Vite McSpacen
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 04 Nov 2004 05:13:08 +0000 |
| parents | 0dbeb6d1e258 |
| children | 5dd9c1df6459 |
| files | src/protocols/oscar/oscar.c src/protocols/oscar/service.c |
| diffstat | 2 files changed, 18 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Thu Nov 04 04:40:57 2004 +0000 +++ b/src/protocols/oscar/oscar.c Thu Nov 04 05:13:08 2004 +0000 @@ -4483,7 +4483,7 @@ gaim_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, (const char **)&to, (const char **)&emailinfo->url, NULL, NULL); g_free(to); } - + if (alertitle) gaim_debug_misc("oscar", "Got an alert '%s' %s\n", alertitle, alerturl ? alerturl : ""); @@ -4999,7 +4999,7 @@ * This function was recommended by the STRFTIME(3) man page to remove the * "last 2 digits" warning. */ -static size_t my_strftime(char *s, size_t max, const char *fmt, +static size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) { return strftime(s, max, fmt, tm); @@ -5720,6 +5720,7 @@ } #endif + /* XXX - Should this be done from AIM accounts, as well? */ if (od->icq) aim_icq_getalias(od->sess, buddy->name); } @@ -7025,7 +7026,7 @@ m = g_list_append(m, act); } } - + return m; }
--- a/src/protocols/oscar/service.c Thu Nov 04 04:40:57 2004 +0000 +++ b/src/protocols/oscar/service.c Thu Nov 04 05:13:08 2004 +0000 @@ -88,7 +88,7 @@ */ aim_setversions(sess, rx->conn); - return 1; + return 1; } /* Subtype 0x0004 - Service request */ @@ -109,7 +109,7 @@ aim_snacid_t snacid; aim_tlvlist_t *tl = NULL; struct chatsnacinfo csi; - + if (!sess || !conn || !roomname || !strlen(roomname)) return -EINVAL; @@ -135,7 +135,7 @@ aim_tx_enqueue(sess, fr); - return 0; + return 0; } /* Subtype 0x0005 - Redirect */ @@ -390,12 +390,12 @@ faim_internal int aim_rates_addparam(aim_session_t *sess, aim_conn_t *conn) { aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside; - aim_frame_t *fr; + aim_frame_t *fr; aim_snacid_t snacid; struct rateclass *rc; if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512))) - return -ENOMEM; + return -ENOMEM; snacid = aim_cachesnac(sess, 0x0001, 0x0008, 0x0000, NULL, 0); aim_putsnac(&fr->data, 0x0001, 0x0008, 0x0000, snacid); @@ -412,12 +412,12 @@ faim_internal int aim_rates_delparam(aim_session_t *sess, aim_conn_t *conn) { aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside; - aim_frame_t *fr; + aim_frame_t *fr; aim_snacid_t snacid; struct rateclass *rc; if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512))) - return -ENOMEM; + return -ENOMEM; snacid = aim_cachesnac(sess, 0x0001, 0x0009, 0x0000, NULL, 0); aim_putsnac(&fr->data, 0x0001, 0x0009, 0x0000, snacid); @@ -440,7 +440,7 @@ code = aimbs_get16(bs); rateclass = aimbs_get16(bs); - + windowsize = aimbs_get32(bs); clear = aimbs_get32(bs); alert = aimbs_get32(bs); @@ -561,7 +561,7 @@ aim_userinfo_t userinfo; memset(&userinfo, 0, sizeof(aim_userinfo_t)); - + newevil = aimbs_get16(bs); if (aim_bstream_empty(bs)) @@ -807,11 +807,11 @@ snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0); aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid); - + aim_tlvlist_add_32(&tl, 0x0006, data); aim_tlvlist_write(&fr->data, &tl); aim_tlvlist_free(&tl); - + aim_tx_enqueue(sess, fr); return 0; @@ -975,13 +975,13 @@ if ((flag == AIM_SENDMEMBLOCK_FLAG_ISHASH) && buf && (len == 0x10)) { /* we're getting a hash */ - aimbs_putraw(&fr->data, buf, 0x10); + aimbs_putraw(&fr->data, buf, 0x10); } else if (buf && (len > 0)) { /* use input buffer */ md5_state_t state; md5_byte_t digest[0x10]; - md5_init(&state); + md5_init(&state); md5_append(&state, (const md5_byte_t *)buf, len); md5_finish(&state, digest); @@ -1057,7 +1057,7 @@ fu16_t type; fu8_t flags, length; - type = aimbs_get16(bs); + type = aimbs_get16(bs); flags = aimbs_get8(bs); length = aimbs_get8(bs);