libtransport.git Changeset - 97637c8d1d40

Changeset - 97637c8d1d40

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 13 years ago 2013-01-17 08:59:07
hanzz.k@gmail.com

pass boost::filesystem::path to createDirectories

2 files changed with 8 insertions and 5 deletions:

CMakeLists.txt

spectrum/src/main.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -211,16 +211,16 @@ find_package(event) @@
 if (NOT WIN32 AND ENABLE_SKYPE)
 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 ######
 if(ENABLE_DOCS)
 	find_package(Doxygen)
 endif()

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -213,12 +213,15 @@ int mainloop() { @@
 	if (storageBackend) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
 		userRegistration->start();
 		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);
 	NetworkPluginServer plugin(&transport, config_, &userManager, &ftManager, &discoItemsResponder);
 	plugin.start();
@@ @@ -394,13 +397,13 @@ int main(int argc, char **argv) @@
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	// 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";
 		return 1;
+	}
 #ifndef WIN32

0 comments (0 inline, 0 general)