[at-spi2-atk] Stop using deprecated glib functions
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Stop using deprecated glib functions
- Date: Mon, 26 Nov 2012 20:03:26 +0000 (UTC)
commit 4f4f2f1cccb0b019b982521e5e300ac9490915bb
Author: Mike Gorse <mgorse suse com>
Date: Mon Nov 26 14:04:05 2012 -0600
Stop using deprecated glib functions
GStaticRecMutex is deprecated. Use GRecMutex instead. Also, this means
that we need at least glib 2.32, so specify that in configure.ac.
atk-adaptor/accessible-cache.c | 12 ++++++------
configure.ac | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/atk-adaptor/accessible-cache.c b/atk-adaptor/accessible-cache.c
index d186130..128d2eb 100644
--- a/atk-adaptor/accessible-cache.c
+++ b/atk-adaptor/accessible-cache.c
@@ -191,7 +191,7 @@ add_object (SpiCache * cache, GObject * gobj)
/*---------------------------------------------------------------------------*/
-static GStaticRecMutex cache_mutex = G_STATIC_REC_MUTEX_INIT;
+static GRecMutex cache_mutex;
#ifdef SPI_ATK_DEBUG
static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
@@ -324,7 +324,7 @@ child_added_listener (GSignalInvocationHint * signal_hint,
const gchar *detail = NULL;
- g_static_rec_mutex_lock (&cache_mutex);
+ g_rec_mutex_lock (&cache_mutex);
/*
* Ensure that only accessibles already in the cache
@@ -351,7 +351,7 @@ child_added_listener (GSignalInvocationHint * signal_hint,
child = g_value_get_pointer (param_values + 2);
if (!child)
{
- g_static_rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
return;
}
@@ -366,7 +366,7 @@ child_added_listener (GSignalInvocationHint * signal_hint,
#endif
}
- g_static_rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
return TRUE;
}
@@ -379,7 +379,7 @@ toplevel_added_listener (AtkObject * accessible,
{
SpiCache *cache = spi_global_cache;
- g_static_rec_mutex_lock (&cache_mutex);
+ g_rec_mutex_lock (&cache_mutex);
g_return_if_fail (ATK_IS_OBJECT (accessible));
@@ -407,7 +407,7 @@ toplevel_added_listener (AtkObject * accessible,
#endif
}
- g_static_rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
}
/*---------------------------------------------------------------------------*/
diff --git a/configure.ac b/configure.ac
index 9a59d05..84d384f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
AC_SUBST(DBUS_LIBS)
AC_SUBST(DBUS_CFLAGS)
-PKG_CHECK_MODULES(GLIB, [glib-2.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32.0])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]