libtransport.git Changeset - 794b2dbaa084

Changeset - 794b2dbaa084

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

Vitaly Takmazov - 14 years ago 2011-12-08 12:29:05
vitalyster@gmail.com

Merge branch 'master' of https://github.com/hanzz/libtransport

2 files changed with 17 insertions and 8 deletions:

spectrum/src/main.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -208,12 +208,13 @@ int main(int argc, char **argv) @@
+	}
 	catch (...) {
 		std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";
 		return 1;
+	}
 #ifndef WIN32
 	if (!CONFIG_STRING(&config, "service.group").empty() ||!CONFIG_STRING(&config, "service.user").empty() ) {
 		struct group *gr;
 		if ((gr = getgrnam(CONFIG_STRING(&config, "service.group").c_str())) == NULL) {
 			std::cerr << "Invalid service.group name " << CONFIG_STRING(&config, "service.group") << "\n";
 			return 1;
+		}
@@ @@ -222,13 +223,12 @@ int main(int argc, char **argv) @@
 			std::cerr << "Invalid service.user name " << CONFIG_STRING(&config, "service.user") << "\n";
 			return 1;
+		}
 		chown(CONFIG_STRING(&config, "service.working_dir").c_str(), pw->pw_uid, gr->gr_gid);
+	}
 #ifndef WIN32
 	if (!no_daemon) {
 		// daemonize
 		daemonize(CONFIG_STRING(&config, "service.working_dir").c_str(), CONFIG_STRING(&config, "service.pidfile").c_str());
 // 		removeOldIcons(CONFIG_STRING(&config, "service.working_dir") + "/icons");
+    }
 #endif
@@ @@ -257,13 +257,13 @@ int main(int argc, char **argv) @@
 		p.setProperty("jid", jid);
 #endif
 		std::string dir;
 		BOOST_FOREACH(const log4cxx::LogString &prop, p.propertyNames()) {
 			if (boost::ends_with(prop, ".File")) {
-				dir = p.get(prop);
+				log4cxx::helpers::Transcoder::encode(p.get(prop), dir);
 				boost::replace_all(dir, "${jid}", jid);
 				break;
+			}
+		}
 		if (!dir.empty()) {

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -113,15 +113,24 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) { @@
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
 	item.setSubscription(Swift::RosterItemPayload::Both);
 	payload->addItem(item);
 	std::vector<Swift::Presence::ref> presences = m_component->getPresenceOracle()->getAllPresence(m_user->getJID().toBare());
 	BOOST_FOREACH(Swift::Presence::ref presence, presences) {
 		Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 	// In server mode we have to send pushes to all resources, but in gateway-mode we send it only to bare JID
 	if (m_component->inServerMode()) {
 		std::vector<Swift::Presence::ref> presences = m_component->getPresenceOracle()->getAllPresence(m_user->getJID().toBare());
 		BOOST_FOREACH(Swift::Presence::ref presence, presences) {
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 			request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, request, buddy->getName()));
 			request->send();
 			m_requests.push_back(request);
+		}
+	}
 	else {
 		Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_user->getJID().toBare(), m_component->getIQRouter());
 		request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, request, buddy->getName()));
 		request->send();
 		m_requests.push_back(request);
+	}
+}
 			m_component->getStanzaChannel()->sendPresence(response);
+		}
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		Swift::Presence::ref currentPresence;
 		response->setTo(presence->getFrom());
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom().toBare());
 		response->setFrom(presence->getTo().toBare().toString() + "/bot");
 		Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(presence->getTo()));
 		if (buddy) {
 			switch (presence->getType()) {
 				// buddy is already there, so nothing to do, just answer
 				case Swift::Presence::Subscribe:
 				case Swift::Presence::Unsubscribe:
 					response->setType(Swift::Presence::Unsubscribed);
 					onBuddyRemoved(buddy);
 					break;
 				// just send response
 				case Swift::Presence::Unsubscribed:
-// 					response->setType(Swift::Presence::Unsubscribe);
 					response->setType(Swift::Presence::Unsubscribe);
 					break;
 				default:
 					return;
+			}
+		}
 		else {

0 comments (0 inline, 0 general)