summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNick Schermer <nick@xfce.org>2012-04-13 17:50:15 +0200
committerNick Schermer <nick@xfce.org>2012-04-13 17:51:51 +0200
commit93e8623827e34b15694f4f2bb305e6171d8a8ecf (patch)
treeeb720b9ba126cad2e4306b4d8f997adf6e62b143 /common
parent53a1425b3bcd4fcfa8cec130ea3fb5ed163eb83e (diff)
downloadxfconf-93e8623827e34b15694f4f2bb305e6171d8a8ecf.tar.gz
Don't use deprecated g_value_set_char (bug #8690).
Diffstat (limited to 'common')
-rw-r--r--common/xfconf-gvaluefuncs.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/xfconf-gvaluefuncs.c b/common/xfconf-gvaluefuncs.c
index 1527cb8..22fe0f0 100644
--- a/common/xfconf-gvaluefuncs.c
+++ b/common/xfconf-gvaluefuncs.c
@@ -178,7 +178,11 @@ _xfconf_gvalue_from_string(GValue *value,
case G_TYPE_UCHAR:
HANDLE_UINT(0, XFCONF_MAXUCHAR, g_value_set_uchar);
case G_TYPE_CHAR:
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ HANDLE_INT(G_MININT8, G_MAXINT8, g_value_set_schar);
+#else
HANDLE_INT(XFCONF_MINCHAR, XFCONF_MAXCHAR, g_value_set_char);
+#endif
case G_TYPE_UINT:
HANDLE_UINT(0, G_MAXUINT, g_value_set_uint);
case G_TYPE_INT:
@@ -265,7 +269,11 @@ _xfconf_string_from_gvalue(GValue *val)
case G_TYPE_UCHAR:
return g_strdup_printf("%u", (guint)g_value_get_uchar(val));
case G_TYPE_CHAR:
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ return g_strdup_printf("%d", g_value_get_schar(val));
+#else
return g_strdup_printf("%d", (gint)g_value_get_char(val));
+#endif
case G_TYPE_UINT:
return g_strdup_printf("%u", g_value_get_uint(val));
case G_TYPE_INT: