From 80e10aad92e553ff5f0084af7507d12635973a39 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 6 Dec 2011 17:29:10 +0100 Subject: [PATCH] Changed main.cpp to fit more-groups changes --- backends/libpurple/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index a8622562..2c04df27 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -69,7 +69,7 @@ class SpectrumNetworkPlugin; GKeyFile *keyfile; SpectrumNetworkPlugin *np; -std::string replaceAll( +static std::string replaceAll( std::string result, const std::string& replaceWhat, const std::string& replaceWithWhat) @@ -808,7 +808,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin { } } - void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::string &groups) { + void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector &groups) { PurpleAccount *account = m_sessions[user]; if (account) { if (m_authRequests.find(user + buddyName) != m_authRequests.end()) { @@ -823,9 +823,10 @@ class SpectrumNetworkPlugin : public NetworkPlugin { } } - void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::string &groups) { + void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector &groups_) { PurpleAccount *account = m_sessions[user]; if (account) { + std::string groups = groups_.empty() ? "" : groups_[0]; if (m_authRequests.find(user + buddyName) != m_authRequests.end()) { m_authRequests[user + buddyName]->authorize_cb(m_authRequests[user + buddyName]->user_data);