X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fglobalsettings.cpp;h=38017f3b14569444c8f1ab45b5d32624bac67e69;hb=ffad6cd6856a0e0de36cad164d9d09e06c0ec52a;hp=6821f342757d49008b250694278da507826dbb1e;hpb=e6c8d58bde2c32f0ee8b73c5577505736caf8e23;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 6821f342..38017f3b 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -342,8 +342,11 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
 
 	QByteArray data = settings.value("value").toByteArray();
 
-	gpointer var_data = g_memdup((gconstpointer)data.constData(),
-		(guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+	gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+	gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
 	GVariant *value = g_variant_new_from_data(var_type, var_data,
 		data.size(), false, g_free, var_data);
@@ -368,8 +371,11 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
 
 	QByteArray data = settings.value("value").toByteArray();
 
-	gpointer var_data = g_memdup((gconstpointer)data.constData(),
-		(guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3)  // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+	gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+	gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
 
 	GVariant *value = g_variant_new_from_data(var_type, var_data,
 		data.size(), false, g_free, var_data);