Mercurial > pidgin
changeset 23906:d2b73439176d
merge of '6b6139039fdaaf6ab1059337085b3b6267bb474e'
and '8eea4c055964a321a6a8f0403d8b27dcd8f0d041'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 17 Aug 2008 19:15:03 +0000 |
parents | 5e7a013bb75e (diff) 5dca6d7e7c1e (current diff) |
children | 3950ff527cb6 |
files | |
diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sun Aug 17 18:10:28 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Aug 17 19:15:03 2008 +0000 @@ -1192,7 +1192,7 @@ static void flap_connection_established_admin(OscarData *od, FlapConnection *conn) { - aim_clientready(od, conn); + aim_srv_clientready(od, conn); purple_debug_info("oscar", "connected to admin\n"); if (od->chpass) { @@ -1237,7 +1237,7 @@ struct chat_connection *chatcon; static int id = 1; - aim_clientready(od, conn); + aim_srv_clientready(od, conn); chatcon = find_oscar_chat_by_conn(gc, conn); if (chatcon) { @@ -1249,7 +1249,7 @@ static void flap_connection_established_chatnav(OscarData *od, FlapConnection *conn) { - aim_clientready(od, conn); + aim_srv_clientready(od, conn); aim_chatnav_reqrights(od, conn); } @@ -1258,7 +1258,7 @@ { aim_email_sendcookies(od); aim_email_activate(od); - aim_clientready(od, conn); + aim_srv_clientready(od, conn); } static void @@ -1266,7 +1266,7 @@ { PurpleConnection *gc = od->gc; - aim_clientready(od, conn); + aim_srv_clientready(od, conn); od->iconconnecting = FALSE; @@ -3770,7 +3770,7 @@ purple_debug_info("oscar", "buddy list loaded\n"); - aim_clientready(od, conn); + aim_srv_clientready(od, conn); if (purple_account_get_user_info(account) != NULL) serv_set_info(gc, purple_account_get_user_info(account));
--- a/libpurple/protocols/oscar/oscar.h Sun Aug 17 18:10:28 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sun Aug 17 19:15:03 2008 +0000 @@ -607,13 +607,10 @@ } chat; }; -void aim_clientready(OscarData *od, FlapConnection *conn); int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn); int aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key, gboolean allow_multiple_logins); /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid); -void aim_cleansnacs(OscarData *, int maxage); - void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags); aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype); @@ -651,6 +648,7 @@ /* 0x0001 - family_oservice.c */ +/* 0x0002 */ void aim_srv_clientready(OscarData *od, FlapConnection *conn); /* 0x0004 */ void aim_srv_requestnew(OscarData *od, guint16 serviceid); /* 0x0006 */ void aim_srv_reqrates(OscarData *od, FlapConnection *conn); /* 0x0008 */ void aim_srv_rates_addparam(OscarData *od, FlapConnection *conn); @@ -1609,6 +1607,7 @@ aim_snacid_t aim_newsnac(OscarData *, aim_snac_t *newsnac); aim_snacid_t aim_cachesnac(OscarData *od, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen); aim_snac_t *aim_remsnac(OscarData *, aim_snacid_t id); +void aim_cleansnacs(OscarData *, int maxage); int aim_putsnac(ByteStream *, guint16 family, guint16 type, guint16 flags, aim_snacid_t id); struct chatsnacinfo {