comparison libpurple/protocols/jabber/adhoccommands.c @ 32672:3828a61c44da

A boring and large patch so I can merge heads.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:21:58 +0000
parents 2d029c5cd305
children
comparison
equal deleted inserted replaced
32671:0e69949b3e61 32672:3828a61c44da
226 void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data) { 226 void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data) {
227 if (PURPLE_BLIST_NODE_IS_BUDDY(node)) { 227 if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
228 JabberAdHocCommands *cmd = data; 228 JabberAdHocCommands *cmd = data;
229 PurpleBuddy *buddy = (PurpleBuddy *) node; 229 PurpleBuddy *buddy = (PurpleBuddy *) node;
230 PurpleAccount *account = purple_buddy_get_account(buddy); 230 PurpleAccount *account = purple_buddy_get_account(buddy);
231 JabberStream *js = purple_account_get_connection(account)->proto_data; 231 PurpleConnection *gc = purple_account_get_connection(account);
232 JabberStream *js = purple_connection_get_protocol_data(gc);
232 233
233 jabber_adhoc_execute(js, cmd); 234 jabber_adhoc_execute(js, cmd);
234 } 235 }
235 } 236 }
236 237
319 320
320 static void jabber_adhoc_server_execute(PurplePluginAction *action) { 321 static void jabber_adhoc_server_execute(PurplePluginAction *action) {
321 JabberAdHocCommands *cmd = action->user_data; 322 JabberAdHocCommands *cmd = action->user_data;
322 if(cmd) { 323 if(cmd) {
323 PurpleConnection *gc = (PurpleConnection *) action->context; 324 PurpleConnection *gc = (PurpleConnection *) action->context;
324 JabberStream *js = gc->proto_data; 325 JabberStream *js = purple_connection_get_protocol_data(gc);
325 326
326 jabber_adhoc_execute(js, cmd); 327 jabber_adhoc_execute(js, cmd);
327 } 328 }
328 } 329 }
329 330