pidgin/pidgin

Merge release-2.x.y branch into default.

2014-02-01, Mark Doliner
0efdb7833dee
Merge release-2.x.y branch into default.

Clean merge, apart from the .tx/config change that we don't want here.
#include "conversation.h"
G_BEGIN_DECLS
PurpleAccount *purple_accounts_find_ext(const char *name, const char *protocol_id,
gboolean (*account_test)(const PurpleAccount *account));
PurpleAccount *purple_accounts_find_any(const char *name, const char *protocol);
PurpleAccount *purple_accounts_find_connected(const char *name, const char *protocol);
G_END_DECLS