Mercurial > pidgin

changeset 29043:97974856c920

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jabber: Simplify.
author Paul Aurich <paul@darkrain42.org>
date Sun, 14 Feb 2010 08:06:00 +0000
parents 0257b8fe21d6
children 89858e3a0464
files libpurple/protocols/jabber/message.c
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c	Sun Feb 14 08:05:08 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun Feb 14 08:06:00 2010 +0000
@@ -930,20 +930,13 @@
 }
 
 static gboolean
-jabber_conv_support_custom_smileys(const PurpleConnection *gc,
+jabber_conv_support_custom_smileys(JabberStream *js,
 								   PurpleConversation *conv,
 								   const gchar *who)
 {
-	JabberStream *js = (JabberStream *) gc->proto_data;
 	JabberBuddy *jb;
 	JabberChat *chat;
 
-	if (!js) {
-		purple_debug_error("jabber",
-			"jabber_conv_support_custom_smileys: could not find stream\n");
-		return FALSE;
-	}
-
 	switch (purple_conversation_get_type(conv)) {
 		case PURPLE_CONV_TYPE_IM:
 			jb = jabber_buddy_find(js, who, FALSE);
@@ -979,7 +972,7 @@
 		purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to,
 			account);
 
-	if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) {
+	if (jabber_conv_support_custom_smileys(jm->js, conv, jm->to)) {
 		GList *found_smileys = jabber_message_xhtml_find_smileys(xhtml);
 
 		if (found_smileys) {