Mercurial > pidgin.yaz

changeset 25984:d24b476cc60f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge (i.e. reapply my changes here).
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 02:19:57 +0000
parents 439f07ce4c8a
children a4a5825fb1bb
files libpurple/protocols/jabber/jabber.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}