diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-03-03 22:08:35 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-03-03 22:08:35 +0000 |
| commit | c21ea1ac88e7510597d434c7fb30d3c240dd8300 (patch) | |
| tree | c7151f006e10c49901f5ec52b5219f83f69711f7 | |
| parent | c3b488bf8cd98ab24d011bd5ce70f8949fe5c7f1 (diff) | |
| parent | ea7d6cc3ee02f60e98e519e79c5a6d879a58a4d3 (diff) | |
| download | pidgin-c21ea1ac88e7510597d434c7fb30d3c240dd8300.tar.gz | |
merge of '278d6c622f5d12ed151fccfaaccfdccef8af0d5d'
and 'b6c3e68f85dab6b0561221f0941056664c404bec'
| -rw-r--r-- | libpurple/protocols/jabber/usermood.c | 6 | ||||
| -rw-r--r-- | libpurple/prpl.h | 3 | ||||
| -rw-r--r-- | pidgin/gtkblist.c | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | pidgin/win32/nsis/generate_gtk_zip.sh | 0 |
4 files changed, 6 insertions, 7 deletions
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c index b3dd448e1e..8411a79ef3 100644 --- a/libpurple/protocols/jabber/usermood.c +++ b/libpurple/protocols/jabber/usermood.c @@ -119,10 +119,6 @@ static PurpleMood moods[] = { {NULL, NULL, NULL} }; -static PurpleMood empty_moods[] = { - {NULL, NULL, NULL} -}; - static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) { /* it doesn't make sense to have more than one item here, so let's just pick the first one */ xmlnode *item = xmlnode_get_child(items, "item"); @@ -268,6 +264,6 @@ PurpleMood *jabber_get_moods(PurpleAccount *account) return moods; } else { purple_debug_info("jabber", "get_moods: account doesn't support PEP\n"); - return empty_moods; + return NULL; } }
\ No newline at end of file diff --git a/libpurple/prpl.h b/libpurple/prpl.h index 4ed0def2fc..69221f14e1 100644 --- a/libpurple/prpl.h +++ b/libpurple/prpl.h @@ -572,7 +572,8 @@ struct _PurplePluginProtocolInfo /** * Returns an array of "PurpleMood"s, with the last one having - * "mood" set to @c NULL. + * "mood" set to @c NULL, or NULL if the account does not support setting + * a mood. */ PurpleMood *(*get_moods)(PurpleAccount *account); }; diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 5ac81b55af..6637e6e03e 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -8016,8 +8016,10 @@ pidgin_blist_update_accounts_menu(void) if (prpl_info && (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) || PURPLE_PLUGIN_HAS_ACTIONS(plugin))) { - if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods)) { + if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) && + prpl_info->get_moods(account) != NULL) { GList *types; + for (types = purple_account_get_status_types(account); types != NULL ; types = types->next) { PurpleStatusType *type = types->data; diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh index 0c12491044..0c12491044 100644..100755 --- a/pidgin/win32/nsis/generate_gtk_zip.sh +++ b/pidgin/win32/nsis/generate_gtk_zip.sh |