diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-07-07 16:07:46 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-07-07 16:07:46 +0000 |
| commit | 8ee2847d70f7fe6e1ef590cf8b50340818660fa9 (patch) | |
| tree | 23fd01fa4dc364bb2dcddb67398b04919dce1fc9 /src | |
| parent | Fix gtk margin API (diff) | |
| parent | Merge branch 'su-v/inkscape-fix-MSYS2-libsoup-req' (diff) | |
| download | inkscape-8ee2847d70f7fe6e1ef590cf8b50340818660fa9.tar.gz inkscape-8ee2847d70f7fe6e1ef590cf8b50340818660fa9.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src')
| -rw-r--r-- | src/io/http.cpp | 2 | ||||
| -rw-r--r-- | src/io/http.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/io/http.cpp b/src/io/http.cpp index dfaa59a31..883f6f56c 100644 --- a/src/io/http.cpp +++ b/src/io/http.cpp @@ -87,7 +87,7 @@ void _get_file_callback(SoupSession *session, SoupMessage *msg, gpointer user_da * your func will be called in a blocking way BEFORE this function returns. * */ -Glib::ustring get_file(Glib::ustring uri, uint timeout, callback func) { +Glib::ustring get_file(Glib::ustring uri, unsigned int timeout, callback func) { SoupURI *s_uri = soup_uri_new(uri.c_str()); const char *host = soup_uri_get_host(s_uri); diff --git a/src/io/http.h b/src/io/http.h index dd58fe9a3..8327ca79d 100644 --- a/src/io/http.h +++ b/src/io/http.h @@ -27,7 +27,7 @@ namespace Inkscape { namespace IO { namespace HTTP { - Glib::ustring get_file(Glib::ustring uri, uint timeout=0, std::function<void(Glib::ustring)> func=NULL); + Glib::ustring get_file(Glib::ustring uri, unsigned int timeout=0, std::function<void(Glib::ustring)> func=NULL); } } |