telepathy-gabble: Remove obsolete GLib < 2.32 code paths

Simon McVittie smcv at kemper.freedesktop.org
Tue Jun 11 03:32:08 PDT 2013


Module: telepathy-gabble
Branch: master
Commit: 7931b9960bc4d357ff04e7381c9d91e161be969d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=7931b9960bc4d357ff04e7381c9d91e161be969d

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Jun  4 12:41:12 2013 +0100

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 at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 src/connection.c |    8 --------
 src/gabble.c     |    7 -------
 2 files changed, 0 insertions(+), 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 bd5056d..e7e4da4 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?)");
 



More information about the telepathy-commits mailing list