pidgin: 2aa174ad: jabber: Simplify.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2aa174ad4c0e50a229c8c951b836b5f788fe7393
Ancestor: 429108b826c513797009a7a9158263cbb2c7bc4a
Author: darkrain42 at pidgin.im
Date: 2010-02-14T08:06:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2aa174ad4c0e50a229c8c951b836b5f788fe7393

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

ChangeLog: 

jabber: Simplify.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c	e18d15fa75d589176373378e99add5ccb437449c
+++ libpurple/protocols/jabber/message.c	c0f8d79bcffce0d66dcab8f8c65d88bc418bdaf3
@@ -930,20 +930,13 @@ static gboolean
 }
 
 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 @@ jabber_message_smileyfy_xhtml(JabberMess
 		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) {