comparison pidgin/gtkblist.c @ 30677:810a6be1920f

merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 07 Jul 2010 17:52:44 +0900
parents 81ffeb069847 53469b47d3f3
children c5ba7dd399fa
comparison
equal deleted inserted replaced
30646:76b2a2636c62 30677:810a6be1920f
3604 purple_request_field_list_add(f, _("None"), ""); 3604 purple_request_field_list_add(f, _("None"), "");
3605 if (current_mood == NULL) 3605 if (current_mood == NULL)
3606 purple_request_field_list_add_selected(f, _("None")); 3606 purple_request_field_list_add_selected(f, _("None"));
3607 3607
3608 /* TODO: rlaager wants this sorted. */ 3608 /* TODO: rlaager wants this sorted. */
3609 /* The connection is checked for PURPLE_CONNECTION_SUPPORT_MOODS flag before 3609 /* TODO: darkrain wants it sorted post-translation */
3610 * this function is called for a non-null account. So using 3610 if (account && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods))
3611 * PURPLE_PROTOCOL_PLUGIN_HAS_FUNC isn't necessary here */ 3611 mood = prpl_info->get_moods(account);
3612 for (mood = account ? prpl_info->get_moods(account) : global_moods; 3612 else
3613 mood->mood != NULL ; mood++) { 3613 mood = global_moods;
3614 for ( ; mood->mood != NULL ; mood++) {
3614 char *path; 3615 char *path;
3615 3616
3616 if (mood->mood == NULL || mood->description == NULL) 3617 if (mood->mood == NULL || mood->description == NULL)
3617 continue; 3618 continue;
3618 3619