# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1372946413 -7200
# Node ID 997282a61ff837a80bb5cee292879fb1f0a73d62
# Parent  511efa5c84dd95ba9fa16c95e34d645b02c3d646
cleaner names

diff -r 511efa5c84dd -r 997282a61ff8 OrthancCppClient/HttpClient.cpp
--- a/OrthancCppClient/HttpClient.cpp	Thu Jul 04 15:53:46 2013 +0200
+++ b/OrthancCppClient/HttpClient.cpp	Thu Jul 04 16:00:13 2013 +0200
@@ -210,4 +210,16 @@
     std::string s = std::string(username) + ":" + std::string(password);
     CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_USERPWD, s.c_str()));
   }
+
+
+  
+  void HttpClient::GlobalInitialize()
+  {
+    CheckCode(curl_global_init(CURL_GLOBAL_DEFAULT));
+  }
+  
+  void HttpClient::GlobalFinalize()
+  {
+    curl_global_cleanup();
+  }
 }
diff -r 511efa5c84dd -r 997282a61ff8 OrthancCppClient/HttpClient.h
--- a/OrthancCppClient/HttpClient.h	Thu Jul 04 15:53:46 2013 +0200
+++ b/OrthancCppClient/HttpClient.h	Thu Jul 04 16:00:13 2013 +0200
@@ -111,5 +111,9 @@
 
     void SetPassword(const char* username,
                      const char* password);
+
+    static void GlobalInitialize();
+  
+    static void GlobalFinalize();
   };
 }
diff -r 511efa5c84dd -r 997282a61ff8 OrthancServer/OrthancInitialization.cpp
--- a/OrthancServer/OrthancInitialization.cpp	Thu Jul 04 15:53:46 2013 +0200
+++ b/OrthancServer/OrthancInitialization.cpp	Thu Jul 04 16:00:13 2013 +0200
@@ -32,6 +32,7 @@
 
 #include "OrthancInitialization.h"
 
+#include "../OrthancCppClient/HttpClient.h"
 #include "../Core/OrthancException.h"
 #include "../Core/Toolbox.h"
 #include "ServerEnumerations.h"
@@ -161,7 +162,7 @@
     defaultDirectory_ = boost::filesystem::current_path();
     ReadGlobalConfiguration(configurationFile);
 
-    curl_global_init(CURL_GLOBAL_ALL);
+    HttpClient::GlobalInitialize();
 
     RegisterUserMetadata();
   }
@@ -171,7 +172,7 @@
   void OrthancFinalize()
   {
     boost::mutex::scoped_lock lock(globalMutex_);
-    curl_global_cleanup();
+    HttpClient::GlobalFinalize();
     configuration_.reset(NULL);
   }