# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1236392397 0
# Node ID d24b476cc60f69b0e01d986d468373209d73aca3
# Parent  439f07ce4c8abdbc532ff28759347737d6177049
Fix merge (i.e. reapply my changes here).

diff -r 439f07ce4c8a -r d24b476cc60f libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Mar 07 02:14:34 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Mar 07 02:19:57 2009 +0000
@@ -2443,10 +2443,16 @@
 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;
 	}