pidgin: 83d86f6b: Allow showing moods for buddies when sig...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 83d86f6bc540c71ddbea143ee7608d63ffccc3d1
Ancestor: 93e8d47716fec9d6fb1ec7441802a3cca9c02b73
Author: malu at pidgin.im
Date: 2010-03-04T22:35:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/83d86f6bc540c71ddbea143ee7608d63ffccc3d1

Modified files:
        libpurple/protocols/jabber/usermood.c libpurple/prpl.h

ChangeLog: 

Allow showing moods for buddies when signed on using an XMPP account not
supporting PEP.
Also remove the mentioning of return NULL for _get_moods to indicate not
supporting setting moods on an account, since there is now a connection flag
for it, and an account can receive moods even though it can't set them (in the
XMPP case).
Also fixes a crash in buddy tooltip. 

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/usermood.c	88a9988c83dd4f272a5509c76bbc2a08e136495e
+++ libpurple/protocols/jabber/usermood.c	54233369f50fbcd5ed9843dee14225cd62e99f76
@@ -256,14 +256,5 @@ PurpleMood *jabber_get_moods(PurpleAccou
 
 PurpleMood *jabber_get_moods(PurpleAccount *account)
 {
-	PurpleConnection *gc = purple_account_get_connection(account);
-	JabberStream *js = (JabberStream *) gc->proto_data;
-
-	if (js->pep) {
-		purple_debug_info("jabber", "get_moods: account supports PEP\n");
-		return moods;
-	} else {
-		purple_debug_info("jabber", "get_moods: account doesn't support PEP\n");
-		return NULL;
-	}
+	return moods;
 }
\ No newline at end of file
============================================================
--- libpurple/prpl.h	a505829812eb1c6e4a16852811c3c66f4114e36a
+++ libpurple/prpl.h	a776b8844260e205c5edf8094fb78c8f899f8531
@@ -572,8 +572,7 @@ struct _PurplePluginProtocolInfo
 
 	/**
 	 * Returns an array of "PurpleMood"s, with the last one having
-	 * "mood" set to @c NULL, or NULL if the account does not support setting
-	 * a mood.
+	 * "mood" set to @c NULL.
 	 */
 	PurpleMood *(*get_moods)(PurpleAccount *account);
 };