cpw.darkrain42.xmpp.iq-handlers: d2baa98b: Fix merge (i.e. reapply my changes here)...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: d2baa98bd1e1a039ec6e1da16ded71318214691a
Ancestor: c8cf650ead5e178135b6ad110e6cfba1846ae67e
Author: paul at darkrain42.org
Date: 2009-03-07T02:19:57
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/d2baa98bd1e1a039ec6e1da16ded71318214691a

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

Fix merge (i.e. reapply my changes here).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	645e2448d3869289d245e7de14c54ab792c9d5f7
+++ libpurple/protocols/jabber/jabber.c	a752e134d060743720ea4fce5dd0b6085303d0c3
@@ -2443,10 +2443,16 @@ static PurpleCmdRet jabber_cmd_ping(Purp
 static PurpleCmdRet jabber_cmd_ping(PurpleConversation *conv,
 		const char *cmd, char **args, char **error, void *data)
 {
+	PurpleAccount *account;
+	PurpleConnection *pc;
+
 	if(!args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	if(!jabber_ping_jid(conv, args[0])) {
+	account = purple_conversation_get_account(conv);
+	pc = purple_account_get_connection(account);
+
+	if(!jabber_ping_jid(purple_connection_get_protocol_data(pc), args[0])) {
 		*error = g_strdup_printf(_("Unable to ping user %s"), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}