[plugins] Fixed incorrect use of g_variant_new_from_data()

In this particular case g_variant_new_fixed_array() can be used and it does the right thing. Bumped minimum glib requirement to 2.32 (which was probably already required anyway).
sailfishos · Sep 6, 2019 · bcd64d0 · bcd64d0
1 parent b3db53e
commit bcd64d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/dbus_service/dbus_service_tag_t2.c b/plugins/dbus_service/dbus_service_tag_t2.c
@@ -80,8 +80,7 @@ dbus_service_tag_t2_dup_data_as_variant(
     guint size)
 {
     return size ?
-        g_variant_new_from_data(G_VARIANT_TYPE("ay"), data, size, TRUE,
-            g_free, g_memdup(data, size)) :
+        g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, data, size, 1) :
         g_variant_new_from_data(G_VARIANT_TYPE("ay"), NULL, 0, TRUE,
             NULL, NULL);
 }

diff --git a/rpm/nfcd.spec b/rpm/nfcd.spec
@@ -9,13 +9,15 @@ Source: %{name}-%{version}.tar.bz2
 
 %define libglibutil_version 1.0.38
 %define libdbuslog_version 1.0.14
+%define glib_version 2.32
 
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= %{glib_version}
 BuildRequires: pkgconfig(libmce-glib)
 BuildRequires: pkgconfig(libdbusaccess)
 BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version}
 BuildRequires: pkgconfig(libdbuslogserver-gio) >= %{libdbuslog_version}
 BuildRequires: file-devel
+Requires: glib-2.0 >= %{glib_version}
 Requires: libglibutil >= %{libglibutil_version}
 Requires: libdbuslogserver-gio >= %{libdbuslog_version}
 Requires: systemd