[Xfce4-commits] <xfconf:master> Fix more deprecated g_value_set_char (bug #8690).

[Nick Schermer]

Updating branch refs/heads/master
         to ce318f06599f9b2e29a6708bde4c51fd016db3fb (commit)
       from 13455e6df99e6b4639cdca308c6e6042509379e1 (commit)

commit ce318f06599f9b2e29a6708bde4c51fd016db3fb
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Apr 18 19:13:12 2012 +0200

    Fix more deprecated  g_value_set_char (bug #8690).

 common/xfconf-gvaluefuncs.c |    4 ++++
 common/xfconf-types.c       |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/common/xfconf-gvaluefuncs.c b/common/xfconf-gvaluefuncs.c
index 22fe0f0..a6d3e07 100644
--- a/common/xfconf-gvaluefuncs.c
+++ b/common/xfconf-gvaluefuncs.c
@@ -326,7 +326,11 @@ _xfconf_gvalue_is_equal(const GValue *value1,
         case G_TYPE_ ## TYPE: \
             return g_value_get_ ## getter(value1) == g_value_get_ ## getter(value2)
 
+#if GLIB_CHECK_VERSION (2, 32, 0)
+        HANDLE_CMP_GV(CHAR, schar);
+#else
         HANDLE_CMP_GV(CHAR, char);
+#endif
         HANDLE_CMP_GV(UCHAR, uchar);
         HANDLE_CMP_GV(BOOLEAN, boolean);
         HANDLE_CMP_GV(INT, int);
diff --git a/common/xfconf-types.c b/common/xfconf-types.c
index 534c318..442becf 100644
--- a/common/xfconf-types.c
+++ b/common/xfconf-types.c
@@ -63,7 +63,11 @@ gvalue_from_short(const GValue *src_value,
         case G_TYPE_BOOLEAN:
             dest = g_value_get_boolean(src_value) == TRUE ? 1 : 0;
             break;
+#if GLIB_CHECK_VERSION (2, 32, 0)
+        HANDLE_TYPE(CHAR, schar)
+#else
         HANDLE_TYPE(CHAR, char)
+#endif
         HANDLE_TYPE(UCHAR, uchar)
         HANDLE_TYPE(INT, int)
         HANDLE_TYPE(UINT, uint)