[Xfce4-commits] [panel-plugins/xfce4-statusnotifier-plugin] 03/08: Add xfconf 4.13 support

[noreply at xfce.org]

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

n   i   n   e   t   l   s       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 panel-plugins/xfce4-statusnotifier-plugin.

commit 560947fd48b26cd0f8a243272af4c4668d62c5ae
Author: Viktor Odintsev <ninetls at xfce.org>
Date:   Thu Jul 13 00:04:55 2017 +0300

    Add xfconf 4.13 support
---
 configure.ac.in          |  5 ++++-
 panel-plugin/sn-config.c | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 74333b5..bbbda8a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -77,7 +77,10 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.13.0],,[
+        AC_DEFINE([XFCONF_LEGACY], [], [Use dbus-glib provided by xfconf 4.12 to obtain array type])
+        XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
+])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
 PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.24.0])
 XDT_CHECK_PACKAGE([DBUSMENU], [dbusmenu-gtk3-0.4], [16.04.0])
diff --git a/panel-plugin/sn-config.c b/panel-plugin/sn-config.c
index d45b3ae..b83a51d 100644
--- a/panel-plugin/sn-config.c
+++ b/panel-plugin/sn-config.c
@@ -30,7 +30,9 @@
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <xfconf/xfconf.h>
+#ifdef XFCONF_LEGACY
 #include <dbus/dbus-glib.h>
+#endif
 
 #include "sn-plugin.h"
 #include "sn-config.h"
@@ -110,11 +112,10 @@ enum
 static guint sn_config_signals[LAST_SIGNAL] = { 0, };
 
 
+#ifdef XFCONF_LEGACY
 
 #define XFCE_TYPE_SN_CONFIG_VALUE_ARRAY (sn_config_value_array_get_type ())
 
-
-
 static GType
 sn_config_value_array_get_type (void)
 {
@@ -130,6 +131,12 @@ sn_config_value_array_get_type (void)
   return type__volatile;
 }
 
+#else
+
+#define XFCE_TYPE_SN_CONFIG_VALUE_ARRAY G_TYPE_PTR_ARRAY
+
+#endif
+
 
 
 static void

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