pidgin: 277dc5f3: Move from "struct yahoo_data" to "YahooD...
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Sun Jul 26 13:30:22 EDT 2009
-----------------------------------------------------------------
Revision: 277dc5f3802ba0f69d4da513bdea94b9973126bd
Ancestor: 87a003eec3a98d8c441b6702a57e4b7f5f41be03
Author: rekkanoryo at pidgin.im
Date: 2009-07-26T17:25:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/277dc5f3802ba0f69d4da513bdea94b9973126bd
Modified files:
libpurple/protocols/yahoo/libymsg.c
libpurple/protocols/yahoo/libymsg.h
libpurple/protocols/yahoo/util.c
libpurple/protocols/yahoo/yahoo_aliases.c
libpurple/protocols/yahoo/yahoo_doodle.c
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_friend.c
libpurple/protocols/yahoo/yahoo_packet.c
libpurple/protocols/yahoo/yahoo_packet.h
libpurple/protocols/yahoo/yahoo_picture.c
libpurple/protocols/yahoo/yahoo_profile.c
libpurple/protocols/yahoo/yahoochat.c
libpurple/protocols/yahoo/yahoochat.h
libpurple/protocols/yahoo/ycht.c
ChangeLog:
Move from "struct yahoo_data" to "YahooData" to be consistent with other structs
in the prpl. I'm sure someone is going to want to shoot me over this, but I'm
tired of seeing "struct yahoo_data" everywhere in this prpl.
-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libymsg.c f8cc8d8a7c5136f0b236bb3e359b04a0f62177d7
+++ libpurple/protocols/yahoo/libymsg.c bcd3ee577bd9073bc31e2b75e7abbb71e94357cc
@@ -456,7 +456,7 @@ static char *_getcookie(char *rawcookie)
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 @@ static void yahoo_process_list_15(Purple
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 @@ static void yahoo_process_list(PurpleCon
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 @@ static void yahoo_process_notify(PurpleC
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 @@ static void yahoo_process_sms_message(Pu
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(Purple
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 @@ yahoo_buddy_add_authorize_cb(gpointer da
{
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 @@ yahoo_buddy_add_deny_cb(struct yahoo_add
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(P
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(PurpleCon
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(PurpleCo
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 @@ static void yahoo_auth16_stage2(PurpleUt
{
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 @@ static void yahoo_auth16_stage2(PurpleUt
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(Purpl
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 @@ static void yahoo_process_addbuddy(Purpl
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 @@ static void yahoo_p2p_keepalive_cb(gpoin
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(gpoi
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 @@ static void yahoo_p2p_process_p2pfilexfe
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 @@ static void yahoo_p2p_read_pkt_cb(gpoint
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 @@ static void yahoo_p2p_server_send_connec
{
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_
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(i
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 @@ void yahoo_send_p2p_pkt(PurpleConnection
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 @@ static void yahoo_p2p_init_cb(gpointer d
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,
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
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(gpoi
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 @@ static void yahoo_web_pending(gpointer d
{
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(gp
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 @@ yahoo_login_page_cb(PurpleUtilFetchUrlDa
{
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)
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) {
}
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 @@ const char *yahoo_list_emblem(PurpleBudd
{
PurpleAccount *account;
PurpleConnection *gc;
- struct yahoo_data *yd;
+ YahooData *yd;
YahooFriend *f;
PurplePresence *presence;
@@ -3613,7 +3613,7 @@ static void yahoo_initiate_conference(Pu
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 @@ static void yahoo_game(PurpleBlistNode *
PurpleBuddy *buddy;
PurpleConnection *gc;
- struct yahoo_data *yd;
+ YahooData *yd;
const char *game;
char *game2;
char *t;
@@ -3661,7 +3661,7 @@ static void yahoo_game(PurpleBlistNode *
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(Yah
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 @@ static GList *yahoo_buddy_menu(PurpleBud
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(PurpleConnectio
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 @@ yahoo_get_inbox_token_cb(PurpleUtilFetch
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 @@ static void yahoo_show_inbox(PurplePlugi
/* 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 @@ static void yahoo_show_act_id(PurplePlug
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 @@ static void yahoo_get_sms_carrier_cb(Pur
{
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(Purple
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,
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(PurpleCon
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 @@ void yahoo_set_status(PurpleAccount *acc
{
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 @@ void yahoo_set_status(PurpleAccount *acc
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
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 *g
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 *g
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
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
}
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
}
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(PurpleCon
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
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 @@ yahoopurple_cmd_chat_join(PurpleConversa
{
GHashTable *comp;
PurpleConnection *gc;
- struct yahoo_data *yd;
+ YahooData *yd;
int id;
if (!args || !args[0])
============================================================
--- libpurple/protocols/yahoo/libymsg.h b0f177e74d2750e065271189eb69d141ee4a90a3
+++ libpurple/protocols/yahoo/libymsg.h c505b82f296148f9159201e9c12d8dc3fcf02bf1
@@ -167,7 +167,7 @@ typedef struct _YahooPersonalDetails {
} phone;
} YahooPersonalDetails;
-struct yahoo_data {
+typedef struct {
PurpleConnection *gc;
int fd;
guchar *rxqueue;
@@ -239,7 +239,7 @@ struct yahoo_data {
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)
============================================================
--- libpurple/protocols/yahoo/util.c a0c6ca2fc240be09a60a76978ab8c09d2145cfba
+++ libpurple/protocols/yahoo/util.c a5664d412d341465c3a529831b0aeb6f4d97027c
@@ -53,7 +53,7 @@ gchar* yahoo_get_cookies(PurpleConnectio
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(PurpleConnecti
*/
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(PurpleConnecti
*/
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;
============================================================
--- libpurple/protocols/yahoo/yahoo_aliases.c bfda7341ff7e09b6a1c3ae30a9bb2862af53bbb7
+++ libpurple/protocols/yahoo/yahoo_aliases.c ea162077f9f899b995a87f57d9d0bc73bae464a5
@@ -74,7 +74,7 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUr
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 @@ yahoo_fetch_aliases(PurpleConnection *gc
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 @@ yahoo_update_alias_cb(PurpleUtilFetchUrl
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 @@ yahoo_update_alias(PurpleConnection *gc,
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 @@ struct yahoo_userinfo {
* which is stupid, and thus not really surprising. */
struct yahoo_userinfo {
- struct yahoo_data *yd;
+ YahooData *yd;
char *xml;
};
@@ -452,7 +452,7 @@ yahoo_set_userinfo_cb(PurpleConnection *
{
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
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
}
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 @@ void yahoo_process_contact_details(Purpl
{
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;
============================================================
--- libpurple/protocols/yahoo/yahoo_doodle.c 6939d4e6fac2d15c443e22fc4b37e20a960a54e1
+++ libpurple/protocols/yahoo/yahoo_doodle.c 4818980f13368988cab255516bdc4106d25065cc
@@ -384,7 +384,7 @@ static void yahoo_doodle_command_send_ge
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);
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c c8bc9760d0837951efff28868df68d2e604ac3af
+++ libpurple/protocols/yahoo/yahoo_filexfer.c 10dc0fdf90132ea7c6cc29e89662979512ca67d5
@@ -80,7 +80,7 @@ static void yahoo_xfer_data_free(struct
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 @@ static void yahoo_sendfile_connected(gpo
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 @@ static void yahoo_xfer_init(PurpleXfer *
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 @@ static void yahoo_xfer_init_15(PurpleXfe
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 @@ static void yahoo_xfer_cancel_send(Purpl
{
PurpleConnection *gc;
PurpleAccount *account;
- struct yahoo_data *yd;
+ YahooData *yd;
struct yahoo_packet *pkt;
gc = xfer_data->gc;
@@ -573,7 +573,7 @@ static void yahoo_xfer_cancel_recv(Purpl
PurpleConnection *gc;
PurpleAccount *account;
- struct yahoo_data *yd;
+ YahooData *yd;
struct yahoo_packet *pkt;
gc = xfer_data->gc;
@@ -634,7 +634,7 @@ static void yahoo_xfer_end(PurpleXfer *x
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 @@ void yahoo_process_filetransfer(PurpleCo
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 @@ static void yahoo_xfer_dns_connected_15(
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 *g
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 @@ static void yahoo_xfer_connected_15(gpoi
PurpleXfer *xfer;
struct yahoo_xfer_data *xd;
PurpleAccount *account;
- struct yahoo_data* yd;
+ YahooData* yd;
if (!(xfer = data))
return;
@@ -1479,7 +1479,7 @@ static void yahoo_p2p_ft_server_listen_c
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 @@ static void yahoo_p2p_client_send_ft_inf
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 @@ void yahoo_process_filetrans_15(PurpleCo
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 @@ void yahoo_process_filetrans_info_15(Pur
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 @@ void yahoo_process_filetrans_acc_15(Purp
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;
============================================================
--- libpurple/protocols/yahoo/yahoo_friend.c cff08d3825f7970066d5aec054dcd057091d9300
+++ libpurple/protocols/yahoo/yahoo_friend.c 625d1164e3b10118133e776f93f614b150e4d3f9
@@ -42,7 +42,7 @@ YahooFriend *yahoo_friend_find(PurpleCon
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(Pu
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(Purple
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;
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.c 73b3e054bfac9cf171335b28c7979d8c28e7f5f6
+++ libpurple/protocols/yahoo/yahoo_packet.c e3deb1c1d0d4e0631cde2d70267928f2b99b4961
@@ -285,7 +285,7 @@ yahoo_packet_send_can_write(gpointer dat
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 @@ size_t yahoo_packet_build(struct yahoo_p
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 @@ int yahoo_packet_send(struct yahoo_packe
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;
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.h f2dbb4a70d271a9138706b1e7fe3774cfd3671a6
+++ libpurple/protocols/yahoo/yahoo_packet.h 11d377f464763aa33c4f9780fa85bdbf0e8bdd03
@@ -137,8 +137,8 @@ void yahoo_packet_hash_int(struct yahoo_
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);
============================================================
--- libpurple/protocols/yahoo/yahoo_picture.c 5584fef71684284730c4bc52e8144d7877f8e8ab
+++ libpurple/protocols/yahoo/yahoo_picture.c 07dd300f6c6820faad574d4567ebd8b7480022e0
@@ -49,7 +49,7 @@ yahoo_fetch_picture_cb(PurpleUtilFetchUr
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(PurpleConnect
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(Purple
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(PurpleConne
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(PurpleCo
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(PurpleC
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(P
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(PurpleCon
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 @@ static void yahoo_buddy_icon_upload_conn
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);
@@ -497,7 +497,7 @@ void yahoo_buddy_icon_upload(PurpleConne
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 */
@@ -542,7 +542,7 @@ void yahoo_set_buddy_icon(PurpleConnecti
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) {
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c f2fab3d63ee85ab094602dde86594cb96a25ce5b
+++ libpurple/protocols/yahoo/yahoo_profile.c c6458d75e5bd8794c6b8830ed4665e97e30fad66
@@ -784,7 +784,7 @@ static void yahoo_got_info(PurpleUtilFet
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 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
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
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;
============================================================
--- libpurple/protocols/yahoo/yahoochat.c 84af22a628265613aa590f435f7500a0ea4fbda8
+++ libpurple/protocols/yahoo/yahoochat.c de23d08d079948d87ca3dae3b248b80016fdfec6
@@ -53,7 +53,7 @@ static void yahoo_chat_online(PurpleConn
/* 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_co
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(PurpleConnec
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 @@ void yahoo_process_chat_online(PurpleCon
/* 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 @@ void yahoo_process_chat_logout(PurpleCon
/* 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(PurpleConne
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 @@ void yahoo_process_chat_exit(PurpleConne
char *who = NULL;
char *room = NULL;
GSList *l;
- struct yahoo_data *yd;
+ YahooData *yd;
yd = gc->proto_data;
@@ -769,7 +769,7 @@ void yahoo_process_chat_goto(PurpleConne
* 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(PurpleConnect
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 @@ static int yahoo_conf_send(PurpleConnect
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(PurpleConn
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(PurpleConne
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(PurpleConnect
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(PurpleConn
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 *g
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,
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 @@ int yahoo_c_send(PurpleConnection *gc, i
{
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,
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 @@ static void yahoo_roomlist_got_connected
{
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."));
============================================================
--- libpurple/protocols/yahoo/yahoochat.h cc387183dffba5aaa4e208d5a225452627ce797a
+++ libpurple/protocols/yahoo/yahoochat.h 1b689985410aeabac47cb5cc895bc01dd37c9abf
@@ -50,7 +50,7 @@ void yahoo_c_invite(PurpleConnection *gc
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);
============================================================
--- libpurple/protocols/yahoo/ycht.c 0ec1151ca6bd41259008ea9d0b2ce78178e028c7
+++ libpurple/protocols/yahoo/ycht.c 5517b316b0b6bedb886d3d28f64b419eca17ff2c
@@ -55,7 +55,7 @@ static void ycht_process_login(YchtConn
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
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 @@ static void ycht_progress_online_friends
{
#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 *ych
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 @@ static void ycht_got_connected(gpointer
{
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(PurpleConnecti
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);
More information about the Commits
mailing list