Mercurial > pidgin

diff libpurple/protocols/jabber/jabber.c @ 32238:1f68af4afe67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use purple_conversation accessor methods.
author andrew.victor@mxit.com
date Sat, 01 Oct 2011 15:03:57 +0000
parents efe38e6319f2
children f75041cb3fec
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sat Oct 01 13:49:37 2011 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Oct 01 15:03:57 2011 +0000
@@ -3163,13 +3163,14 @@
 static PurpleCmdRet jabber_cmd_buzz(PurpleConversation *conv,
 		const char *cmd, char **args, char **error, void *data)
 {
-	JabberStream *js = purple_connection_get_protocol_data(conv->account->gc);
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	JabberStream *js = purple_connection_get_protocol_data(account->gc);
 	const gchar *who;
 	gchar *description;
 	PurpleBuddy *buddy;
 	const char *alias;
 	PurpleAttentionType *attn =
-		purple_get_attention_type_from_code(conv->account, 0);
+		purple_get_attention_type_from_code(account, 0);
 
 	if (!args || !args[0]) {
 		/* use the buddy from conversation, if it's a one-to-one conversation */
@@ -3182,7 +3183,7 @@
 		who = args[0];
 	}
 
-	buddy = purple_find_buddy(conv->account, who);
+	buddy = purple_find_buddy(account, who);
 	if (buddy != NULL)
 		alias = purple_buddy_get_contact_alias(buddy);
 	else
@@ -3574,7 +3575,8 @@
 jabber_cmd_mood(PurpleConversation *conv,
 		const char *cmd, char **args, char **error, void *data)
 {
-	JabberStream *js = purple_connection_get_protocol_data(conv->account->gc);
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	JabberStream *js = purple_connection_get_protocol_data(account->gc);
 
 	if (js->pep) {
 		/* if no argument was given, unset mood */