[Xfce4-commits] [xfce/xfce4-settings] 01/01: Replace XFCONF_TYPE_G_VALUE_ARRAY, require xfconf 4.13 Settings Editor needs to add support for GPtrArray and touchpad support needs to be improved.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 6a5930fb1050f99b6e494eedcca977e74cba7f62
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Jun 12 19:34:28 2017 -0400

    Replace XFCONF_TYPE_G_VALUE_ARRAY, require xfconf 4.13
    Settings Editor needs to add support for GPtrArray and touchpad support needs to be improved.
---
 configure.ac.in        | 2 +-
 xfsettingsd/pointers.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c818087..5dff8b3 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -96,7 +96,7 @@ XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.10])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
 XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-3], [4.12.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.13.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
 XDT_CHECK_PACKAGE([FONTCONFIG], [fontconfig], [2.6.0])
 
diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index 017175b..409a9b2 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -47,7 +47,6 @@
 #include "pointers-defines.h"
 
 #define MAX_DENOMINATOR (100.00)
-#define XFCONF_TYPE_G_VALUE_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE))
 
 #ifdef XI_PROP_ENABLED
 #define DEVICE_ENABLED XI_PROP_ENABLED
@@ -809,7 +808,7 @@ xfce_pointers_helper_change_property (XDeviceInfo  *device_info,
                 /* only 1 items to set */
                 val = value;
             }
-            else if (G_VALUE_TYPE (value) == XFCONF_TYPE_G_VALUE_ARRAY)
+            else if (G_VALUE_TYPE (value) == G_TYPE_PTR_ARRAY)
             {
                 array = g_value_get_boxed (value);
                 if (array->len != n_items)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.