diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-04 12:41:12 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 11:13:07 +0100 |
| commit | 7931b9960bc4d357ff04e7381c9d91e161be969d (patch) | |
| tree | ecfc139bb90ca8948a114452aaae3f0cf96c23e8 | |
| parent | 2a8a6a50be5241627108a23f1dd1ba8d12693f8b (diff) | |
Remove obsolete GLib < 2.32 code paths
We now depend on 2.32.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65290
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
| -rw-r--r-- | src/connection.c | 8 | ||||
| -rw-r--r-- | src/gabble.c | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/connection.c b/src/connection.c index cc15a0adc..4bc10fc40 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 bd5056dfd..e7e4da4d9 100644 --- a/src/gabble.c +++ b/src/gabble.c @@ -108,13 +108,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 - if (!dbus_threads_init_default ()) g_error ("Unable to initialize libdbus thread-safety (out of memory?)"); |