From d66c66cc04b8a4538f7aab240881c3c404e1d731 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 3 Jun 2013 12:40:01 +0100 Subject: [PATCH 6/8] Remove obsolete GLib < 2.32 code paths We now depend on 2.32. --- src/connection.c | 8 -------- src/gabble.c | 7 ------- 2 files changed, 15 deletions(-) diff --git a/src/connection.c b/src/connection.c index cc15a0a..4bc10fc 100644 --- a/src/connection.c +++ b/src/connection.c @@ -617,11 +617,7 @@ gabble_connection_get_property (GObject *object, g_value_set_string (value, priv->resource); break; case PROP_PRIORITY: -#if GLIB_CHECK_VERSION (2, 31, 0) g_value_set_schar (value, priv->priority); -#else - g_value_set_char (value, priv->priority); -#endif break; case PROP_HTTPS_PROXY_SERVER: g_value_set_string (value, priv->https_proxy_server); @@ -760,11 +756,7 @@ gabble_connection_set_property (GObject *object, } break; case PROP_PRIORITY: -#if GLIB_CHECK_VERSION (2, 31, 0) priv->priority = g_value_get_schar (value); -#else - priv->priority = g_value_get_char (value); -#endif break; case PROP_HTTPS_PROXY_SERVER: g_free (priv->https_proxy_server); diff --git a/src/gabble.c b/src/gabble.c index f6bbf2c..1cb2b8f 100644 --- a/src/gabble.c +++ b/src/gabble.c @@ -106,13 +106,6 @@ log_handler (const gchar *log_domain, void gabble_init (void) { -#if !GLIB_CHECK_VERSION (2, 31, 0) - /* libsoup uses glib in multiple threads and don't have this, so we have to - * enable it manually here */ - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - g_type_init (); wocky_init (); } -- 1.7.10.4