From ee1b8ec11f785525475755303fbcef4a18551645 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 11 Jun 2013 15:02:40 +0100 Subject: [PATCH 2/7] Remove GLib < 2.32 code paths Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54114 Signed-off-by: Simon McVittie --- src/idle-muc-channel.c | 4 ---- src/idle-parser.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c index 6e298aa..89824a8 100644 --- a/src/idle-muc-channel.c +++ b/src/idle-muc-channel.c @@ -823,11 +823,7 @@ void idle_muc_channel_namereply(IdleMUCChannel *chan, GValueArray *args) { for (guint i = 1; (i + 1) < args->n_values; i += 2) { TpHandle handle = g_value_get_uint(g_value_array_get_nth(args, i)); -#if GLIB_CHECK_VERSION(2, 31, 0) gchar modechar = g_value_get_schar(g_value_array_get_nth(args, i + 1)); -#else - gchar modechar = g_value_get_char(g_value_array_get_nth(args, i + 1)); -#endif if (handle == base_conn->self_handle) { guint remove = MODE_FLAG_OPERATOR_PRIVILEGE | MODE_FLAG_VOICE_PRIVILEGE | MODE_FLAG_HALFOP_PRIVILEGE; diff --git a/src/idle-parser.c b/src/idle-parser.c index 159e6cc..6f0885c 100644 --- a/src/idle-parser.c +++ b/src/idle-parser.c @@ -541,11 +541,7 @@ static gboolean _parse_atom(IdleParser *parser, GValueArray *arr, char atom, con if (atom == 'C') { g_value_init(&val, G_TYPE_CHAR); -#if GLIB_CHECK_VERSION(2, 31, 0) g_value_set_schar(&val, modechar); -#else - g_value_set_char(&val, modechar); -#endif g_value_array_append(arr, &val); g_value_unset(&val); -- 1.7.10.4