diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 15:02:40 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-11 11:51:22 +0100 |
| commit | 23acb636cb9400179e5ed51c9380acb7ff620e38 (patch) | |
| tree | 7ea0ac9d6a0d1dd87007155ef9cbeb84aae3f84a | |
| parent | 2a6ee02e097a11fb8d4995f4eed26384d12636d9 (diff) | |
Remove GLib < 2.32 code paths
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54114
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | src/idle-muc-channel.c | 4 | ||||
| -rw-r--r-- | src/idle-parser.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c index 277dbdb..c335efa 100644 --- a/src/idle-muc-channel.c +++ b/src/idle-muc-channel.c @@ -818,11 +818,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 == tp_base_connection_get_self_handle (base_conn)) { 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); |