Mercurial > pidgin.yaz
changeset 28026:042786b478c1
merge of '0cb5b3f2ca9b11063ea0e18c4fc723568e254965'
and '277dc5f3802ba0f69d4da513bdea94b9973126bd'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 26 Jul 2009 17:43:00 +0000 |
| parents | e5551c23f972 (current diff) 908be3822215 (diff) |
| children | be6999665c5e 735040819c16 |
| files | |
| diffstat | 14 files changed, 143 insertions(+), 143 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Sun Jul 26 17:43:00 2009 +0000 @@ -456,7 +456,7 @@ return cookie; } -static void yahoo_process_cookie(struct yahoo_data *yd, char *c) +static void yahoo_process_cookie(YahooData *yd, char *c) { if (c[0] == 'Y') { if (yd->cookie_y) @@ -476,7 +476,7 @@ GSList *l = pkt->hash; PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; GHashTable *ht; char *norm_bud = NULL; char *temp = NULL; @@ -607,7 +607,7 @@ PurpleGroup *g; YahooFriend *f = NULL; PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; GHashTable *ht; char **lines; @@ -754,7 +754,7 @@ YahooFriend *f = NULL; GSList *l = pkt->hash; gint val_11 = 0; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; gboolean msn = FALSE; account = purple_connection_get_account(gc); @@ -849,7 +849,7 @@ PurpleAccount *account; GSList *l = pkt->hash; struct _yahoo_im *sms = NULL; - struct yahoo_data *yd; + YahooData *yd; char *server_msg = NULL; char *m; @@ -909,7 +909,7 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt, yahoo_pkt_type pkt_type) { PurpleAccount *account; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; GSList *l = pkt->hash; GSList *list = NULL; struct _yahoo_im *im = NULL; @@ -1142,7 +1142,7 @@ { struct yahoo_add_request *add_req = data; struct yahoo_packet *pkt; - struct yahoo_data *yd = add_req->gc->proto_data; + YahooData *yd = add_req->gc->proto_data; const char *who = add_req->who; if (add_req->protocol == 2) @@ -1165,7 +1165,7 @@ static void yahoo_buddy_add_deny_cb(struct yahoo_add_request *add_req, const char *msg) { - struct yahoo_data *yd = add_req->gc->proto_data; + YahooData *yd = add_req->gc->proto_data; struct yahoo_packet *pkt; char *encoded_msg = NULL; const char *who = add_req->who; @@ -1217,7 +1217,7 @@ static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason) { char *notify_msg; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; if (who == NULL) return; @@ -1524,7 +1524,7 @@ static void yahoo_process_mail(PurpleConnection *gc, struct yahoo_packet *pkt) { PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; const char *who = NULL; const char *email = NULL; const char *subj = NULL; @@ -1608,7 +1608,7 @@ static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleAccount *account = purple_connection_get_account(gc); const char *name = purple_normalize(account, purple_account_get_username(account)); PurpleCipher *md5_cipher; @@ -1651,7 +1651,7 @@ { struct yahoo_auth_data *auth_data = user_data; PurpleConnection *gc = auth_data->gc; - struct yahoo_data *yd; + YahooData *yd; gboolean try_login_on_error = FALSE; purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n"); @@ -1662,7 +1662,7 @@ g_return_if_reached(); } - yd = (struct yahoo_data *)gc->proto_data; + yd = (YahooData *)gc->proto_data; if (error_message != NULL) { purple_debug_error("yahoo", "Login Failed, unable to retrieve stage 2 url: %s\n", error_message); @@ -2026,7 +2026,7 @@ static void yahoo_process_authresp(PurpleConnection *gc, struct yahoo_packet *pkt) { #ifdef TRY_WEBMESSENGER_LOGIN - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; #endif /* TRY_WEBMESSENGER_LOGIN */ GSList *l = pkt->hash; int err = 0; @@ -2110,7 +2110,7 @@ char *buf; YahooFriend *f; GSList *l = pkt->hash; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; int protocol = 0; gboolean msn = FALSE; @@ -2197,7 +2197,7 @@ PurpleConnection *gc = user_data; struct yahoo_packet *pkt_to_send; PurpleAccount *account; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; account = purple_connection_get_account(gc); @@ -2216,7 +2216,7 @@ static gboolean yahoo_p2p_keepalive(gpointer data) { PurpleConnection *gc = data; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; g_hash_table_foreach(yd->peers, yahoo_p2p_keepalive_cb, gc); @@ -2257,7 +2257,7 @@ struct yahoo_packet *pkt_to_send; PurpleAccount *account; int val_13_to_send = 0; - struct yahoo_data *yd; + YahooData *yd; YahooFriend *f; if(!(p2p_data = data)) @@ -2344,7 +2344,7 @@ struct yahoo_packet *pkt; guchar *start = NULL; struct yahoo_p2p_data *p2p_data; - struct yahoo_data *yd; + YahooData *yd; if(!(p2p_data = data)) return ; @@ -2416,7 +2416,7 @@ { int acceptfd; struct yahoo_p2p_data *p2p_data; - struct yahoo_data *yd; + YahooData *yd; if(!(p2p_data = data)) return ; @@ -2455,7 +2455,7 @@ static gboolean yahoo_cancel_p2p_server_listen_cb(gpointer data) { struct yahoo_p2p_data *p2p_data; - struct yahoo_data *yd; + YahooData *yd; if(!(p2p_data = data)) return FALSE; @@ -2476,7 +2476,7 @@ static void yahoo_p2p_server_listen_cb(int listenfd, gpointer data) { struct yahoo_p2p_data *p2p_data; - struct yahoo_data *yd; + YahooData *yd; if(!(p2p_data = data)) return ; @@ -2508,7 +2508,7 @@ YahooFriend *f; struct yahoo_packet *pkt; PurpleAccount *account; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_p2p_data *p2p_data; f = yahoo_friend_find(gc, who); @@ -2576,7 +2576,7 @@ struct yahoo_p2p_data *p2p_data; struct yahoo_packet *pkt_to_send; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; if(!(p2p_data = data)) return ; @@ -2922,7 +2922,7 @@ static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond) { PurpleConnection *gc = data; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; char buf[1024]; int len; @@ -3019,7 +3019,7 @@ static void yahoo_got_connected(gpointer data, gint source, const gchar *error_message) { PurpleConnection *gc = data; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; if (source < 0) { @@ -3045,7 +3045,7 @@ static void yahoo_got_web_connected(gpointer data, gint source, const gchar *error_message) { PurpleConnection *gc = data; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; if (source < 0) { @@ -3075,7 +3075,7 @@ { PurpleConnection *gc = data; PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; char bufread[2048], *i = bufread, *buf = bufread; int len; GString *s; @@ -3150,7 +3150,7 @@ static void yahoo_got_cookies_send_cb(gpointer data, gint source, PurpleInputCondition cond) { PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; int written, remaining; gc = data; @@ -3264,7 +3264,7 @@ { PurpleConnection *gc = (PurpleConnection *)user_data; PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; const char *sn = purple_account_get_username(account); const char *pass = purple_connection_get_password(gc); GHashTable *hash = yahoo_login_page_hash(url_text, len); @@ -3405,7 +3405,7 @@ void yahoo_login(PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account); - struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1); + YahooData *yd = gc->proto_data = g_new0(YahooData, 1); PurpleStatus *status = purple_account_get_active_status(account); const char *server = NULL; int pager_port = 0; @@ -3452,7 +3452,7 @@ } void yahoo_close(PurpleConnection *gc) { - struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; + YahooData *yd = (YahooData *)gc->proto_data; GSList *l; if (gc->inpa) @@ -3550,7 +3550,7 @@ { PurpleAccount *account; PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; YahooFriend *f; PurplePresence *presence; @@ -3613,7 +3613,7 @@ PurpleConnection *gc; GHashTable *components; - struct yahoo_data *yd; + YahooData *yd; int id; g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); @@ -3650,7 +3650,7 @@ PurpleBuddy *buddy; PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; const char *game; char *game2; char *t; @@ -3661,7 +3661,7 @@ buddy = (PurpleBuddy *) node; gc = purple_account_get_connection(purple_buddy_get_account(buddy)); - yd = (struct yahoo_data *) gc->proto_data; + yd = (YahooData *) gc->proto_data; f = yahoo_friend_find(gc, purple_buddy_get_name(buddy)); if (!f) @@ -3818,7 +3818,7 @@ static GList *build_presence_submenu(YahooFriend *f, PurpleConnection *gc) { GList *m = NULL; PurpleMenuAction *act; - struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + YahooData *yd = (YahooData *) gc->proto_data; if (yd->current_status == YAHOO_STATUS_INVISIBLE) { if (f->presence != YAHOO_PRESENCE_ONLINE) { @@ -3878,7 +3878,7 @@ PurpleMenuAction *act; PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy)); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; static char buf2[1024]; YahooFriend *f; @@ -3959,7 +3959,7 @@ static void yahoo_act_id(PurpleConnection *gc, PurpleRequestFields *fields) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; const char *name = yd->profiles[purple_request_fields_get_choice(fields, "id")]; struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_IDACT, YAHOO_STATUS_AVAILABLE, yd->session_id); @@ -3976,7 +3976,7 @@ PurpleConnection *gc = user_data; gboolean set_cookie = FALSE; gchar *url; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc)); @@ -4012,7 +4012,7 @@ /* XXX I have no idea how this will work with Yahoo! Japan. */ PurpleConnection *gc = action->context; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleUtilFetchUrlData *url_data; const char* base_url = "http://login.yahoo.com"; @@ -4056,7 +4056,7 @@ PurpleRequestFieldGroup *group; PurpleRequestField *field; PurpleConnection *gc = (PurpleConnection *) action->context; - struct yahoo_data *yd = purple_connection_get_protocol_data(gc); + YahooData *yd = purple_connection_get_protocol_data(gc); const char *name = purple_connection_get_display_name(gc); int iter; @@ -4126,7 +4126,7 @@ { struct yahoo_sms_carrier_cb_data *sms_cb_data = user_data; PurpleConnection *gc = sms_cb_data->gc; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; char *mobile_no = NULL; char *status = NULL; char *carrier = NULL; @@ -4177,7 +4177,7 @@ static void yahoo_get_sms_carrier(PurpleConnection *gc, gpointer data) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleUtilFetchUrlData *url_data; struct yahoo_sms_carrier_cb_data *sms_cb_data; char *validate_request_str = NULL; @@ -4235,7 +4235,7 @@ int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt = NULL; char *msg = yahoo_html_to_codes(what); char *msg2; @@ -4386,7 +4386,7 @@ unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_p2p_data *p2p_data; gboolean msn = !g_strncasecmp(who, "msn/", 4); struct yahoo_packet *pkt = NULL; @@ -4431,7 +4431,7 @@ { PurpleConnection *gc; PurplePresence *presence; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; int old_status; const char *msg = NULL; @@ -4444,7 +4444,7 @@ gc = purple_account_get_connection(account); presence = purple_status_get_presence(status); - yd = (struct yahoo_data *)gc->proto_data; + yd = (YahooData *)gc->proto_data; old_status = yd->current_status; yd->current_status = get_yahoo_status_from_purple_status(status); @@ -4506,7 +4506,7 @@ void yahoo_set_idle(PurpleConnection *gc, int idle) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt = NULL; char *msg = NULL, *msg2 = NULL; PurpleStatus *status = NULL; @@ -4612,7 +4612,7 @@ void yahoo_keepalive(PurpleConnection *gc) { struct yahoo_packet *pkt; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; time_t now = time(NULL); /* We're only allowed to send a ping once an hour or the servers will boot us */ @@ -4645,7 +4645,7 @@ void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g) { - struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; + YahooData *yd = (YahooData *)gc->proto_data; struct yahoo_packet *pkt; const char *group = NULL; char *group2; @@ -4709,7 +4709,7 @@ void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) { - struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; + YahooData *yd = (YahooData *)gc->proto_data; struct yahoo_packet *pkt; GSList *buddies, *l; PurpleGroup *g; @@ -4757,7 +4757,7 @@ } void yahoo_add_deny(PurpleConnection *gc, const char *who) { - struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; + YahooData *yd = (YahooData *)gc->proto_data; struct yahoo_packet *pkt; if (!yd->logged_in) @@ -4773,7 +4773,7 @@ } void yahoo_rem_deny(PurpleConnection *gc, const char *who) { - struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; + YahooData *yd = (YahooData *)gc->proto_data; struct yahoo_packet *pkt; if (!yd->logged_in) @@ -4814,7 +4814,7 @@ void yahoo_change_buddys_group(PurpleConnection *gc, const char *who, const char *old_group, const char *new_group) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; char *gpn, *gpo; YahooFriend *f = yahoo_friend_find(gc, who); @@ -4863,7 +4863,7 @@ void yahoo_rename_group(PurpleConnection *gc, const char *old_name, PurpleGroup *group, GList *moved_buddies) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; char *gpn, *gpo; @@ -4903,7 +4903,7 @@ { GHashTable *comp; PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; int id; if (!args || !args[0])
--- a/libpurple/protocols/yahoo/libymsg.h Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.h Sun Jul 26 17:43:00 2009 +0000 @@ -167,7 +167,7 @@ } phone; } YahooPersonalDetails; -struct yahoo_data { +typedef struct { PurpleConnection *gc; int fd; guchar *rxqueue; @@ -239,7 +239,7 @@ int yahoo_p2p_server_watcher; GHashTable *sms_carrier; /* sms carrier data */ guint yahoo_p2p_server_timeout_handle; -}; +} YahooData; #define YAHOO_MAX_STATUS_MESSAGE_LENGTH (255)
--- a/libpurple/protocols/yahoo/util.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/util.c Sun Jul 26 17:43:00 2009 +0000 @@ -53,7 +53,7 @@ gchar *t1,*t2,*t3; GSList *tmp; GSList *cookies; - cookies = ((struct yahoo_data*)(gc->proto_data))->cookies; + cookies = ((YahooData*)(gc->proto_data))->cookies; tmp = cookies; while(tmp) { @@ -118,7 +118,7 @@ */ char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean *utf8) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; char *ret; const char *to_codeset; @@ -147,7 +147,7 @@ */ char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; char *ret; const char *from_codeset;
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Sun Jul 26 17:43:00 2009 +0000 @@ -37,9 +37,9 @@ #include "yahoo_packet.h" /* I hate hardcoding this stuff, but Yahoo never sends us anything to use. Someone in the know may be able to tweak this URL */ -#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=8.1.0.249&useutf8=1&legenc=codepage-1252" +#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOO_CLIENT_VERSION "&useutf8=1&legenc=codepage-1252" #define YAHOO_ALIAS_UPDATE_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252" -#define YAHOOJP_ALIAS_FETCH_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&diffs=1&t=0&tags=short&rt=0&prog-ver=7.0.0.7" +#define YAHOOJP_ALIAS_FETCH_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOOJP_CLIENT_VERSION #define YAHOOJP_ALIAS_UPDATE_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&sync=1&tags=short&noclear=1" void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias); @@ -74,7 +74,7 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message) { PurpleConnection *gc = user_data; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; yd->url_datas = g_slist_remove(yd->url_datas, url_data); @@ -186,7 +186,7 @@ void yahoo_fetch_aliases(PurpleConnection *gc) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; const char *url; gchar *request, *webpage, *webaddress; PurpleUtilFetchUrlData *url_data; @@ -228,7 +228,7 @@ xmlnode *node, *result; struct callback_data *cb = user_data; PurpleConnection *gc = cb->gc; - struct yahoo_data *yd; + YahooData *yd; yd = gc->proto_data; yd->url_datas = g_slist_remove(yd->url_datas, url_data); @@ -289,7 +289,7 @@ void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias) { - struct yahoo_data *yd; + YahooData *yd; const char *url; gchar *content, *request, *webpage, *webaddress; struct callback_data *cb; @@ -403,7 +403,7 @@ * which is stupid, and thus not really surprising. */ struct yahoo_userinfo { - struct yahoo_data *yd; + YahooData *yd; char *xml; }; @@ -452,7 +452,7 @@ { xmlnode *node = xmlnode_new("ab"); xmlnode *ct = xmlnode_new_child(node, "ct"); - struct yahoo_data *yd = purple_connection_get_protocol_data(gc); + YahooData *yd = purple_connection_get_protocol_data(gc); PurpleAccount *account; PurpleUtilFetchUrlData *url_data; char *webaddress, *webpage; @@ -592,7 +592,7 @@ void yahoo_set_userinfo(PurpleConnection *gc) { - struct yahoo_data *yd = purple_connection_get_protocol_data(gc); + YahooData *yd = purple_connection_get_protocol_data(gc); PurpleRequestFields *fields = request_fields_from_personal_details(&yd->ypd, purple_connection_get_display_name(gc)); purple_request_fields(gc, NULL, _("Set User Info"), NULL, fields, @@ -602,7 +602,7 @@ } static gboolean -parse_contact_details(struct yahoo_data *yd, const char *who, const char *xml) +parse_contact_details(YahooData *yd, const char *who, const char *xml) { xmlnode *node, *nd; YahooFriend *f; @@ -690,7 +690,7 @@ { GSList *l = pkt->hash; const char *who = NULL, *xml = NULL; - struct yahoo_data *yd = purple_connection_get_protocol_data(gc); + YahooData *yd = purple_connection_get_protocol_data(gc); for (; l; l = l->next) { struct yahoo_pair *pair = l->data;
--- a/libpurple/protocols/yahoo/yahoo_doodle.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.c Sun Jul 26 17:43:00 2009 +0000 @@ -384,7 +384,7 @@ const char *imv, const char *sixtyfour) { - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; purple_debug_info("yahoo", "doodle: Sent %s (%s)\n", type, to);
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Sun Jul 26 17:43:00 2009 +0000 @@ -80,7 +80,7 @@ static void yahoo_xfer_data_free(struct yahoo_xfer_data *xd) { PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; PurpleXfer *xfer; GSList *l; @@ -233,7 +233,7 @@ size_t content_length, header_len, pkt_buf_len; PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; purple_debug_info("yahoo", "in yahoo_sendfile_connected\n"); @@ -311,7 +311,7 @@ struct yahoo_xfer_data *xfer_data; PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; xfer_data = xfer->data; gc = xfer_data->gc; @@ -354,7 +354,7 @@ struct yahoo_xfer_data *xfer_data; PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; xfer_data = xfer->data; @@ -525,7 +525,7 @@ { PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; gc = xfer_data->gc; @@ -573,7 +573,7 @@ PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; gc = xfer_data->gc; @@ -634,7 +634,7 @@ struct yahoo_xfer_data *xfer_data; PurpleXfer *xfer = NULL; PurpleConnection *gc; - struct yahoo_data *yd; + YahooData *yd; xfer_data = xfer_old->data; if(xfer_data && xfer_data->version == 15 @@ -802,7 +802,7 @@ char *imv = NULL; long expires = 0; PurpleXfer *xfer; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_xfer_data *xfer_data; char *service = NULL; char *filename = NULL; @@ -985,7 +985,7 @@ long a,b,c,d; PurpleConnection *gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; gchar *url; gchar *filename; @@ -1068,7 +1068,7 @@ void yahoo_send_file(PurpleConnection *gc, const char *who, const char *file) { struct yahoo_xfer_data *xfer_data; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleXfer *xfer = yahoo_new_xfer(gc, who); g_return_if_fail(xfer != NULL); @@ -1226,7 +1226,7 @@ PurpleXfer *xfer; struct yahoo_xfer_data *xd; PurpleAccount *account; - struct yahoo_data* yd; + YahooData* yd; if (!(xfer = data)) return; @@ -1479,7 +1479,7 @@ struct yahoo_xfer_data *xd; struct yahoo_packet *pkt; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; gchar *filename; const char *local_ip; gchar *url_to_send = NULL; @@ -1546,7 +1546,7 @@ struct yahoo_xfer_data *xd; struct yahoo_packet *pkt; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; gchar *filename; struct yahoo_p2p_data *p2p_data; @@ -1583,7 +1583,7 @@ char *imv = NULL; long val_222 = 0L; PurpleXfer *xfer; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_xfer_data *xfer_data; char *service = NULL; char *filename = NULL; @@ -1760,7 +1760,7 @@ long val_249 = 0; long val_66 = 0; PurpleXfer *xfer; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_xfer_data *xfer_data; char *filename = NULL; char *xfer_peer_idstring = NULL; @@ -1867,7 +1867,7 @@ gchar *xfer_peer_idstring = NULL; gchar *xfer_idstring_for_relay = NULL; PurpleXfer *xfer; - struct yahoo_data *yd; + YahooData *yd; struct yahoo_xfer_data *xfer_data; GSList *l; PurpleAccount *account;
--- a/libpurple/protocols/yahoo/yahoo_friend.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_friend.c Sun Jul 26 17:43:00 2009 +0000 @@ -42,7 +42,7 @@ YahooFriend *yahoo_friend_find(PurpleConnection *gc, const char *name) { - struct yahoo_data *yd; + YahooData *yd; const char *norm; g_return_val_if_fail(gc != NULL, NULL); @@ -57,7 +57,7 @@ YahooFriend *yahoo_friend_find_or_new(PurpleConnection *gc, const char *name) { YahooFriend *f; - struct yahoo_data *yd; + YahooData *yd; const char *norm; g_return_val_if_fail(gc != NULL, NULL); @@ -215,7 +215,7 @@ void yahoo_friend_update_presence(PurpleConnection *gc, const char *name, YahooPresenceVisibility presence) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt = NULL; YahooFriend *f; const char *thirtyone, *thirteen;
--- a/libpurple/protocols/yahoo/yahoo_packet.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.c Sun Jul 26 17:43:00 2009 +0000 @@ -285,7 +285,7 @@ static void yahoo_packet_send_can_write(gpointer data, gint source, PurpleInputCondition cond) { - struct yahoo_data *yd = data; + YahooData *yd = data; int ret, writelen; writelen = purple_circ_buffer_get_max_read(yd->txbuf); @@ -342,7 +342,7 @@ return len; } -int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd) +int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd) { size_t len; gssize ret; @@ -382,7 +382,7 @@ return ret; } -int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd) +int yahoo_packet_send_and_free(struct yahoo_packet *pkt, YahooData *yd) { int ret;
--- a/libpurple/protocols/yahoo/yahoo_packet.h Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.h Sun Jul 26 17:43:00 2009 +0000 @@ -137,8 +137,8 @@ void yahoo_packet_hash(struct yahoo_packet *pkt, const char *fmt, ...); void yahoo_packet_hash_str(struct yahoo_packet *pkt, int key, const char *value); void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value); -int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd); -int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd); +int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd); +int yahoo_packet_send_and_free(struct yahoo_packet *pkt, YahooData *yd); size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, gboolean jp, guchar **buf); void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len);
--- a/libpurple/protocols/yahoo/yahoo_picture.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_picture.c Sun Jul 26 17:43:00 2009 +0000 @@ -49,7 +49,7 @@ const gchar *pic_data, size_t len, const gchar *error_message) { struct yahoo_fetch_picture_data *d; - struct yahoo_data *yd; + YahooData *yd; d = user_data; yd = d->gc->proto_data; @@ -71,7 +71,7 @@ void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt) { - struct yahoo_data *yd; + YahooData *yd; GSList *l = pkt->hash; char *who = NULL, *us = NULL; gboolean got_icon_info = FALSE, send_icon_info = FALSE; @@ -192,7 +192,7 @@ void yahoo_process_picture_upload(PurpleConnection *gc, struct yahoo_packet *pkt) { PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; GSList *l = pkt->hash; char *url = NULL; @@ -268,7 +268,7 @@ void yahoo_send_picture_info(PurpleConnection *gc, const char *who) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; if (!yd->picture_url) { @@ -285,7 +285,7 @@ void yahoo_send_picture_request(PurpleConnection *gc, const char *who) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, yd->session_id); @@ -297,7 +297,7 @@ void yahoo_send_picture_checksum(PurpleConnection *gc) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, yd->session_id); @@ -308,7 +308,7 @@ void yahoo_send_picture_update_to_user(PurpleConnection *gc, const char *who, int type) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; pkt = yahoo_packet_new(YAHOO_SERVICE_AVATAR_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id); @@ -333,7 +333,7 @@ void yahoo_send_picture_update(PurpleConnection *gc, int type) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yspufe data; data.gc = gc; @@ -427,7 +427,7 @@ gsize pkt_buf_len; PurpleConnection *gc = d->gc; PurpleAccount *account; - struct yahoo_data *yd; + YahooData *yd; /* use whole URL if using HTTP Proxy */ gboolean use_whole_url = yahoo_account_use_http_proxy(gc); @@ -461,7 +461,7 @@ /* header + packet + "29" + 0xc0 + 0x80) + pictureblob */ - host = purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST); + host = purple_account_get_string(account, "xfer_host", yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST); port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT); tmp = g_strdup_printf("%s:%d", host, port); header = g_strdup_printf("POST %s%s/notifyft HTTP/1.1\r\n" @@ -497,7 +497,7 @@ void yahoo_buddy_icon_upload(PurpleConnection *gc, struct yahoo_buddy_icon_upload_data *d) { PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; if (yd->buddy_icon_connect_data != NULL) { /* Cancel any in-progress buddy icon upload */ @@ -506,8 +506,8 @@ } yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account, - yd->jp ? purple_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST) - : purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), + purple_account_get_string(account, "xfer_host", + yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST), purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), yahoo_buddy_icon_upload_connected, d); @@ -542,7 +542,7 @@ void yahoo_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleAccount *account = gc->account; if (img == NULL) {
--- a/libpurple/protocols/yahoo/yahoo_profile.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_profile.c Sun Jul 26 17:43:00 2009 +0000 @@ -784,7 +784,7 @@ char *tmp; char *profile_url_text = NULL; int lang, strid; - struct yahoo_data *yd; + YahooData *yd; const profile_strings_node_t *strings = NULL; const char *title; profile_state_t profile_state = PROFILE_STATE_DEFAULT; @@ -956,7 +956,7 @@ const gchar *url_text, size_t len, const gchar *error_message) { YahooGetInfoStepTwoData *info2_data = (YahooGetInfoStepTwoData *)data; - struct yahoo_data *yd; + YahooData *yd; gboolean found = FALSE; int id = -1; @@ -1264,7 +1264,7 @@ void yahoo_get_info(PurpleConnection *gc, const char *name) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; YahooGetInfoData *data; char *url; PurpleUtilFetchUrlData *url_data;
--- a/libpurple/protocols/yahoo/yahoochat.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Sun Jul 26 17:43:00 2009 +0000 @@ -53,7 +53,7 @@ /* special function to log us on to the yahoo chat service */ static void yahoo_chat_online(PurpleConnection *gc) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; const char *rll; @@ -98,7 +98,7 @@ static PurpleConversation *yahoo_find_conference(PurpleConnection *gc, const char *name) { - struct yahoo_data *yd; + YahooData *yd; GSList *l; yd = gc->proto_data; @@ -373,7 +373,7 @@ static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *room, const char *topic, const char *id) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; char *room2; gboolean utf8 = TRUE; @@ -401,7 +401,7 @@ /* this is a confirmation of yahoo_chat_online(); */ void yahoo_process_chat_online(PurpleConnection *gc, struct yahoo_packet *pkt) { - struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + YahooData *yd = (YahooData *) gc->proto_data; if (pkt->status == 1) { yd->chat_online = TRUE; @@ -433,7 +433,7 @@ /* this is basicly the opposite of chat_online */ void yahoo_process_chat_logout(PurpleConnection *gc, struct yahoo_packet *pkt) { - struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + YahooData *yd = (YahooData *) gc->proto_data; GSList *l; for (l = pkt->hash; l; l = l->next) { @@ -463,7 +463,7 @@ void yahoo_process_chat_join(PurpleConnection *gc, struct yahoo_packet *pkt) { PurpleAccount *account = purple_connection_get_account(gc); - struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + YahooData *yd = (YahooData *) gc->proto_data; PurpleConversation *c = NULL; GSList *l; GList *members = NULL; @@ -618,7 +618,7 @@ char *who = NULL; char *room = NULL; GSList *l; - struct yahoo_data *yd; + YahooData *yd; yd = gc->proto_data; @@ -769,7 +769,7 @@ * I think conference names are always ascii. */ -void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who) +void yahoo_conf_leave(YahooData *yd, const char *room, const char *dn, GList *who) { struct yahoo_packet *pkt; GList *w; @@ -791,7 +791,7 @@ static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *room, GList *members, const char *what) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; GList *who; char *msg, *msg2; @@ -818,7 +818,7 @@ return 0; } -static void yahoo_conf_join(struct yahoo_data *yd, PurpleConversation *c, const char *dn, const char *room, +static void yahoo_conf_join(YahooData *yd, PurpleConversation *c, const char *dn, const char *room, const char *topic, const char *members) { struct yahoo_packet *pkt; @@ -848,7 +848,7 @@ static void yahoo_conf_invite(PurpleConnection *gc, PurpleConversation *c, const char *dn, const char *buddy, const char *room, const char *msg) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; GList *members; char *msg2 = NULL; @@ -878,7 +878,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char *dn, gboolean logout) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; PurpleConversation *c; @@ -930,7 +930,7 @@ static int yahoo_chat_send(PurpleConnection *gc, const char *dn, const char *room, const char *what, PurpleMessageFlags flags) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; int me = 0; char *msg1, *msg2, *room2; @@ -975,7 +975,7 @@ static void yahoo_chat_invite(PurpleConnection *gc, const char *dn, const char *buddy, const char *room, const char *msg) { - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; struct yahoo_packet *pkt; char *room2, *msg2 = NULL; gboolean utf8 = TRUE; @@ -1000,7 +1000,7 @@ void yahoo_chat_goto(PurpleConnection *gc, const char *name) { - struct yahoo_data *yd; + YahooData *yd; struct yahoo_packet *pkt; yd = gc->proto_data; @@ -1035,7 +1035,7 @@ void yahoo_c_leave(PurpleConnection *gc, int id) { - struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + YahooData *yd = (YahooData *) gc->proto_data; PurpleConversation *c; if (!yd) @@ -1060,9 +1060,9 @@ { PurpleConversation *c; int ret; - struct yahoo_data *yd; + YahooData *yd; - yd = (struct yahoo_data *) gc->proto_data; + yd = (YahooData *) gc->proto_data; if (!yd) return -1; @@ -1116,11 +1116,11 @@ void yahoo_c_join(PurpleConnection *gc, GHashTable *data) { - struct yahoo_data *yd; + YahooData *yd; char *room, *topic, *type; PurpleConversation *c; - yd = (struct yahoo_data *) gc->proto_data; + yd = (YahooData *) gc->proto_data; if (!yd) return; @@ -1480,7 +1480,7 @@ { struct yahoo_roomlist *yrl = data; PurpleRoomlist *list = yrl->list; - struct yahoo_data *yd = purple_account_get_connection(list->account)->proto_data; + YahooData *yd = purple_account_get_connection(list->account)->proto_data; if (source < 0) { purple_notify_error(purple_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
--- a/libpurple/protocols/yahoo/yahoochat.h Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.h Sun Jul 26 17:43:00 2009 +0000 @@ -50,7 +50,7 @@ char *yahoo_get_chat_name(GHashTable *data); void yahoo_c_invite(PurpleConnection *gc, int id, const char *msg, const char *name); -void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who); +void yahoo_conf_leave(YahooData *yd, const char *room, const char *dn, GList *who); void yahoo_chat_goto(PurpleConnection *gc, const char *name);
--- a/libpurple/protocols/yahoo/ycht.c Sun Jul 26 15:24:29 2009 +0000 +++ b/libpurple/protocols/yahoo/ycht.c Sun Jul 26 17:43:00 2009 +0000 @@ -55,7 +55,7 @@ static void ycht_process_login(YchtConn *ycht, YchtPkt *pkt) { PurpleConnection *gc = ycht->gc; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; if (ycht->logged_in) return; @@ -70,7 +70,7 @@ static void ycht_process_logout(YchtConn *ycht, YchtPkt *pkt) { PurpleConnection *gc = ycht->gc; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; yd->chat_online = FALSE; ycht->logged_in = FALSE; @@ -175,7 +175,7 @@ { #if 0 PurpleConnection *gc = ycht->gc; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; if (ycht->logged_in) return; @@ -431,7 +431,7 @@ void ycht_connection_close(YchtConn *ycht) { - struct yahoo_data *yd = ycht->gc->proto_data; + YahooData *yd = ycht->gc->proto_data; if (yd) { yd->ycht = NULL; @@ -543,7 +543,7 @@ { YchtConn *ycht = data; PurpleConnection *gc = ycht->gc; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; YchtPkt *pkt; char *buf; @@ -570,7 +570,7 @@ void ycht_connection_open(PurpleConnection *gc) { YchtConn *ycht; - struct yahoo_data *yd = gc->proto_data; + YahooData *yd = gc->proto_data; PurpleAccount *account = purple_connection_get_account(gc); ycht = g_new0(YchtConn, 1);