stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

support for protocol=any and prefix in JID

Browse source
This commit is contained in:
HanzZ 2011-07-26 21:19:21 +02:00
parent 835c66fc61
commit 7146bdc362
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
backends/libpurple/main.cpp
View file

@ -170,10 +170,18 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
PurpleAccount *account = NULL;
const char *protocol = CONFIG_STRING(config, "service.protocol").c_str();
if (purple_accounts_find(legacyName.c_str(), protocol) != NULL){
std::string name = legacyName;
std::string protocol = CONFIG_STRING(config, "service.protocol");
if (CONFIG_STRING(config, "service.protocol") == "any") {
protocol = name.substr(0, name.find("."));
name = name.substr(name.find(".") + 1);
}
LOG4CXX_INFO(logger, "Creating account with name '" << name.c_str() << "' and protocol '" << protocol << "'");
if (purple_accounts_find(name.c_str(), protocol.c_str()) != NULL){
// Log(user, "this account already exists");
account = purple_accounts_find(legacyName.c_str(), protocol);
account = purple_accounts_find(name.c_str(), protocol.c_str());
// User *u = (User *) account->ui_data;
// if (u && u != user) {
// Log(userInfo.jid, "This account is already connected by another jid " << user->getJID());
@ -182,7 +190,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
}
else {
// Log(user, "creating new account");
account = purple_account_new(legacyName.c_str(), protocol);
account = purple_account_new(name.c_str(), protocol.c_str());
purple_accounts_add(account);
}
@ -218,8 +226,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
}
void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
const char *protocol = CONFIG_STRING(config, "service.protocol").c_str();
PurpleAccount *account = purple_accounts_find(legacyName.c_str(), protocol);
PurpleAccount *account = m_sessions[user];
if (account) {
// VALGRIND_DO_LEAK_CHECK;
m_sessions[user] = NULL;

2
spectrum/src/sample.cfg
View file

@ -14,7 +14,7 @@ users_per_backend=10
backend=../../backends/libpurple/spectrum_libpurple_backend
#backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
#protocol=prpl-jabber
protocol=prpl-msn
protocol=any
#protocol=prpl-icq
[backend]