[Xfce4-commits] [panel-plugins/xfce4-indicator-plugin] 01/01: Compilation fixes for xfconf4.13

[noreply at xfce.org]

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

a   n   d   r   z   e   j   r       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-indicator-plugin.

commit 7099de347f70817005725899bfb0f4ccfcc00ef2
Author: Andrzej <andrzejr at xfce.org>
Date:   Thu Jul 13 09:04:11 2017 +0100

    Compilation fixes for xfconf4.13
    
    The plugin compiles but does not work (with xfconf4.13).
    When adding the plugin to the panel it freezes/displays a 1px line
    and config dialog does not open. Following errors are reported:
    
    (wrapper-2.0:8467): GLib-CRITICAL **: g_variant_builder_end: assertion '!GVSB(builder)->uniform_item_types || GVSB(builder)->prev_item_type != NULL || g_variant_type_is_definite (GVSB(builder)->type)' failed
    
    (wrapper-2.0:8467): GLib-CRITICAL **: g_variant_ref_sink: assertion 'value != NULL' failed
---
 configure.ac.in                 | 5 ++++-
 panel-plugin/indicator-config.c | 2 ++
 panel-plugin/indicator-config.h | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 588a388..1ae586a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -82,7 +82,10 @@ dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.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.6.0])
+])
 INDICATOR_PKGNAME=indicator3-0.4
 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
 
diff --git a/panel-plugin/indicator-config.c b/panel-plugin/indicator-config.c
index 440b593..3193514 100644
--- a/panel-plugin/indicator-config.c
+++ b/panel-plugin/indicator-config.c
@@ -123,6 +123,7 @@ G_DEFINE_TYPE (IndicatorConfig, indicator_config, G_TYPE_OBJECT)
 
 
 
+#ifdef XFCONF_LEGACY
 GType
 indicator_config_value_array_get_type (void)
 {
@@ -137,6 +138,7 @@ indicator_config_value_array_get_type (void)
 
   return type__volatile;
 }
+#endif
 
 
 static void
diff --git a/panel-plugin/indicator-config.h b/panel-plugin/indicator-config.h
index c254d79..46624e4 100644
--- a/panel-plugin/indicator-config.h
+++ b/panel-plugin/indicator-config.h
@@ -20,7 +20,9 @@
 #define __INDICATOR_CONFIG_H__
 
 #include <glib.h>
+#ifdef XFCONF_LEGACY
 #include <dbus/dbus-glib.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -34,7 +36,11 @@ typedef struct _IndicatorConfig      IndicatorConfig;
 #define XFCE_IS_INDICATOR_CONFIG_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_INDICATOR_CONFIG))
 #define XFCE_INDICATOR_CONFIG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_INDICATOR_CONFIG, IndicatorConfigClass))
 
+#ifdef XFCONF_LEGACY
 #define XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY (indicator_config_value_array_get_type ())
+#else
+#define XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY G_TYPE_PTR_ARRAY
+#endif
 
 GType              indicator_config_value_array_get_type    (void) G_GNUC_CONST;
 

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