Updating branch refs/heads/master
to b86f57645efc88921eb2111323a287c5260bd4d6 (commit)
from ce318f06599f9b2e29a6708bde4c51fd016db3fb (commit)
commit b86f57645efc88921eb2111323a287c5260bd4d6
Author: Nick Schermer <[email protected]>
Date: Wed Apr 18 19:37:36 2012 +0200
Two other g_value_get_char's.
xfconf/xfconf-channel.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index 9d906d3..546db3b 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -1461,7 +1461,11 @@ xfconf_channel_get_array_valist(XfconfChannel *channel,
switch(cur_value_type) {
HANDLE_CASE(guchar, UCHAR, uchar)
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ HANDLE_CASE(gchar, CHAR, schar)
+#else
HANDLE_CASE(gchar, CHAR, char)
+#endif
HANDLE_CASE(guint32, UINT, uint)
HANDLE_CASE(gint32, INT, int)
HANDLE_CASE(guint64, UINT64, uint64)
@@ -1637,7 +1641,11 @@ xfconf_channel_set_array_valist(XfconfChannel *channel,
switch(cur_value_type) {
HANDLE_CASE(guchar, UCHAR, uchar)
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ HANDLE_CASE(gchar, CHAR, schar)
+#else
HANDLE_CASE(gchar, CHAR, char)
+#endif
HANDLE_CASE(guint32, UINT, uint)
HANDLE_CASE(gint32, INT, int)
HANDLE_CASE(guint64, UINT64, uint64)
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
