[evolution-data-server] Remove other GLib 2.35.x checks.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove other GLib 2.35.x checks.
- Date: Fri, 27 Sep 2013 17:33:46 +0000 (UTC)
commit 866bf669fc68a1847993f8ae89b70b252ebddff7
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Sep 27 13:19:46 2013 -0400
Remove other GLib 2.35.x checks.
libebackend/e-backend.c | 19 -------------------
libedataserver/e-flag.c | 2 --
2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/libebackend/e-backend.c b/libebackend/e-backend.c
index aa1ed4f..2abbf1e 100644
--- a/libebackend/e-backend.c
+++ b/libebackend/e-backend.c
@@ -152,25 +152,6 @@ backend_update_online_state_idle_cb (gpointer user_data)
cancellable = NULL;
}
-#if !GLIB_CHECK_VERSION (2, 35, 9)
- if (connectable && G_IS_NETWORK_ADDRESS (connectable)) {
- GNetworkAddress *network_address = G_NETWORK_ADDRESS (connectable);
-
- /* Create a copy of the backend's connectable, because once
- * the connectable reaches its destination it caches the value
- * and doesn't retry after network changes.
- *
- * This is fixed since GLib 2.35.9, see:
- * https://bugzilla.gnome.org/show_bug.cgi?id=694181
- */
- connectable = g_network_address_new (
- g_network_address_get_hostname (network_address),
- g_network_address_get_port (network_address));
-
- g_object_unref (network_address);
- }
-#endif
-
if (!connectable) {
gchar *host = NULL;
guint16 port = 0;
diff --git a/libedataserver/e-flag.c b/libedataserver/e-flag.c
index ffa1846..0e06a9f 100644
--- a/libedataserver/e-flag.c
+++ b/libedataserver/e-flag.c
@@ -27,13 +27,11 @@ struct _EFlag {
/* This is to keep e_flag_timed_wait() building, since
* it relies on g_cond_timed_wait() which is deprecated. */
-#if GLIB_CHECK_VERSION(2,35,6)
#ifdef G_DISABLE_DEPRECATED
gboolean g_cond_timed_wait (GCond *cond,
GMutex *mutex,
GTimeVal *timeval);
#endif /* G_DISABLE_DEPRECATED */
-#endif /* GLIB_CHECK_VERSION */
/**
* e_flag_new:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]