[evolution-activesync] Silence build with, and require, glib 2.32
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync] Silence build with, and require, glib 2.32
- Date: Wed, 8 May 2013 14:05:18 +0000 (UTC)
commit 3095f2950d59084b71c135c01acefeeb6e8cc073
Author: David Woodhouse <David Woodhouse intel com>
Date: Wed May 8 14:51:36 2013 +0100
Silence build with, and require, glib 2.32
configure.ac | 2 +-
eas-daemon/libeas/eas-connection.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 74d93ff..fdbe669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_SUBST(NO_UNDEFINED)
IT_PROG_INTLTOOL([0.35.5])
AM_GLIB_GNU_GETTEXT
-AM_PATH_GLIB_2_0
+AM_PATH_GLIB_2_0([2.32.0], [], [AC_ERROR([glib 2.32 not found])])
AM_DISABLE_STATIC
AC_PROG_LIBTOOL
diff --git a/eas-daemon/libeas/eas-connection.c b/eas-daemon/libeas/eas-connection.c
index 4e6c8fb..a0645a0 100644
--- a/eas-daemon/libeas/eas-connection.c
+++ b/eas-daemon/libeas/eas-connection.c
@@ -91,8 +91,8 @@
/* For the number of connections */
#define EAS_CONNECTION_MAX_REQUESTS 1
-#define QUEUE_LOCK(x) (g_static_rec_mutex_lock(&(x)->priv->queue_lock))
-#define QUEUE_UNLOCK(x) (g_static_rec_mutex_unlock(&(x)->priv->queue_lock))
+#define QUEUE_LOCK(x) (g_rec_mutex_lock(&(x)->priv->queue_lock))
+#define QUEUE_UNLOCK(x) (g_rec_mutex_unlock(&(x)->priv->queue_lock))
struct _EasConnectionPrivate {
SoupSession* soup_session;
@@ -117,7 +117,7 @@ struct _EasConnectionPrivate {
GSList *jobs;
GSList *provisioning_jobs;
GSList *active_job_queue;
- GStaticRecMutex queue_lock;
+ GRecMutex queue_lock;
gboolean reprovisioning;
};
@@ -232,10 +232,11 @@ eas_connection_init (EasConnection *self)
g_debug ("eas_connection_init++");
+ g_rec_mutex_init(&priv->queue_lock);
priv->soup_context = g_main_context_new ();
priv->soup_loop = g_main_loop_new (priv->soup_context, FALSE);
- priv->soup_thread = g_thread_create (eas_soup_thread, priv, TRUE, NULL);
+ priv->soup_thread = g_thread_new ("eas_soup_thread", eas_soup_thread, priv);
/* create the SoupSession for this connection */
priv->soup_session =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]