talons

commit 038b8092f1f664e2929664cb3809d29fb8ca471c
parent a33ae166a64cdc536b97fbf672d057ebace7e545
Author: Jonathan Boeing <jonathan.n.boeing@gmail.com>
Date:   Sun, 25 Jul 2021 21:08:10 -0700

Fix GLib deprecation warning

g_memdup was deprecated in GLib 2.68 and superceded by g_memdup2

Diffstat:
M
src/plugins/litehtml_viewer/http.cpp
 | 
21
+++++++++++++--------

1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
@@ -33,15 +33,20 @@ struct Data {
 };
 
 static size_t write_data(char* ptr, size_t size, size_t nmemb, void* data_ptr) {
-    struct Data* data = (struct Data *) data_ptr;
-    size_t realsize = size * nmemb;
-
-		g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
-				g_memdup(ptr, realsize), realsize,
-				g_free);
-		data->size += realsize;
+	struct Data* data = (struct Data *) data_ptr;
+	size_t realsize = size * nmemb;
+
+	g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
+#if !GLIB_CHECK_VERSION (2, 68, 0)
+		g_memdup(ptr, realsize),
+#else
+		g_memdup2(ptr, realsize),
+#endif
+		realsize,
+		g_free);
+	data->size += realsize;
     
-    return realsize;
+	return realsize;
 }
 
 http::http()