Attachment 87388 Details for Bug 54114 – 3/3] Remove GLib < 2.32 code paths

[patch] 3/3] Remove GLib < 2.32 code paths

0003-Remove-GLib-2.32-code-paths.patch (text/plain), 1.65 KB, created by Simon McVittie on 2013-10-10 12:11:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-10 12:11:41 UTC

Size: 1.65 KB

patch

obsolete

>From ddcad6c42e88f027e73c86416d12a393614e26b2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 11 Jun 2013 15:02:40 +0100
>Subject: [PATCH 3/3] 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>
>---
> 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 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);
> 
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 54114: 80692 | 80693 | 80694 | 80695 | 80696 | 80697 | 80698 | 87386 | 87387 | 87388

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.