From 97637c8d1d40677a3074ad8ff14d67b3c9b9fcc1 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 17 Jan 2013 08:59:07 +0100 Subject: [PATCH] pass boost::filesystem::path to createDirectories --- CMakeLists.txt | 8 ++++---- spectrum/src/main.cpp | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aea57c9c..3cc08cf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,10 +214,10 @@ set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") find_package(dbus) endif() -if(ENABLE_YAHOO2) - set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") - find_package(yahoo2) -endif() +# if(ENABLE_YAHOO2) +# set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") +# find_package(yahoo2) +# endif() ####### Miscallanous ###### diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp index 7a46f24f..2397766b 100644 --- a/spectrum/src/main.cpp +++ b/spectrum/src/main.cpp @@ -216,6 +216,9 @@ int mainloop() { usersReconnecter = new UsersReconnecter(&transport, storageBackend); } + else if (!CONFIG_BOOL(config_, "service.server_mode")) { + LOG4CXX_WARN(logger, "Registrations won't work, you have specified [database] type=none in config file."); + } FileTransferManager ftManager(&transport, &userManager); @@ -397,7 +400,7 @@ int main(int argc, char **argv) // create directories try { - Transport::Util::createDirectories(&config, CONFIG_STRING(&config, "service.working_dir")); + Transport::Util::createDirectories(&config, boost::filesystem::path(CONFIG_STRING(&config, "service.working_dir"))); } catch (...) { std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";