diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index 657a37992821639d41c43c04570f384f3a08ce55..51943171f5ebd0eb3931f864959dab0c38ec5858 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -76,6 +76,13 @@ static std::string KEYFILE_STRING(const std::string &cat, const std::string &key } std::string ret(str); free(str); + + if (ret.find("#") != std::string::npos) { + ret = ret.substr(0, ret.find("#")); + while(*(ret.end() - 1) == ' ') { + ret.erase(ret.end() - 1); + } + } return ret; } diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg index c89c787113b889b3b2c6d6a5003155a9bc457740..71b1d23b1ebbe3b81790c3e3c89a7602bae79e7e 100644 --- a/spectrum/src/sample.cfg +++ b/spectrum/src/sample.cfg @@ -4,7 +4,8 @@ password = secret server = 127.0.0.1 port = 5222 server_mode = 1 -backend_host=localhost # < this option doesn't work yet +backend_host=localhost +# < this option doesn't work yet backend_port=10001 admin_username=admin admin_password=test @@ -25,7 +26,7 @@ protocol=any [logging] #config=logging.cfg # log4cxx/log4j logging configuration file -#backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends +#backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends [database] type = none # or "none" without database backend diff --git a/spectrum/src/sample2.cfg b/spectrum/src/sample2.cfg index 10347f9eed2bbe1f681ecc22873a9f7fa19f51ae..ca499f669eda6456284c7fb3c3a974ec8bf1fb7c 100644 --- a/spectrum/src/sample2.cfg +++ b/spectrum/src/sample2.cfg @@ -65,7 +65,7 @@ type=xmpp config = /etc/spectrum2/logging.cfg # log4cxx/log4j logging configuration file in ini format used for backends. -backend_config = /etc/spectrum2/backend_logging.cfg # log4cxx/log4j logging configuration file for backends +backend_config = /etc/spectrum2/backend-logging.cfg # log4cxx/log4j logging configuration file for backends [database] # Database backend type