make formspec textarea wordwrap

[dragonfireclient.git] / src / convert_json.cpp

diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index dbf0a82ac670ed4de56f6e6a69cd2fc976fb34f1..6f227e7967501818789185036e7082403d81b016 100644 (file)
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -29,16 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "version.h"
 #include "httpfetch.h"
+#include "porting.h"
 
-Json::Value                 fetchJsonValue(const std::string url,
-                                                                                                       struct curl_slist *chunk) {
+Json::Value                 fetchJsonValue(const std::string &url,
+                                           struct curl_slist *chunk) {
 #if USE_CURL
 
        HTTPFetchRequest fetchrequest;
        HTTPFetchResult fetchresult;
        fetchrequest.url = url;
-       fetchrequest.useragent = std::string("Minetest ")+minetest_version_hash;
-       fetchrequest.timeout = g_settings->getS32("curl_timeout");
        fetchrequest.caller = HTTPFETCH_SYNC;
 
        struct curl_slist* runptr = chunk;