Mercurial > pidgin.yaz
changeset 29930:9f6a657af957
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.
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 04 Mar 2010 22:35:32 +0000 |
| parents | 3e5bb4e2334c |
| children | b0cb194dc139 |
| files | libpurple/protocols/jabber/usermood.c libpurple/prpl.h |
| diffstat | 2 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/usermood.c Thu Mar 04 22:14:03 2010 +0000 +++ b/libpurple/protocols/jabber/usermood.c Thu Mar 04 22:35:32 2010 +0000 @@ -256,14 +256,5 @@ 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
--- a/libpurple/prpl.h Thu Mar 04 22:14:03 2010 +0000 +++ b/libpurple/prpl.h Thu Mar 04 22:35:32 2010 +0000 @@ -572,8 +572,7 @@ /** * 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); };