[glom] Avoid deprecated glibmm API (from glibmm/thread.h).

[Murray Cumming <murrayc src gnome org>]

commit c92a85a9b126fff28cc93881d7239bedf6cc7462
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 23 14:23:52 2011 +0100

    Avoid deprecated glibmm API (from glibmm/thread.h).
    
    * configure.ac: Depend on a recent unstable glibmm.
    * glom/libglom/spawn_with_feedback.cc: Use Glib::Threads::Cond and
    Glib::Threads::Mutex instead of deprecated Glib::Cond and Glib::Mutex.

 ChangeLog                           |   10 ++++++++++
 configure.ac                        |    4 +---
 glom/libglom/spawn_with_feedback.cc |    4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ab71db6..2ba5e8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-23  Murray Cumming  <murrayc murrayc com>
+
+	Avoid deprecated glibmm API (from glibmm/thread.h).
+
+	* configure.ac: Depend on a recent unstable glibmm. 
+	* glom/libglom/spawn_with_feedback.cc: Use Glib::Threads::Cond and 
+	Glib::Threads::Mutex instead of deprecated Glib::Cond and Glib::Mutex.
+
+This is the master branch. See also the glom-1-20 branch.
+
 2011-11-21  Murray Cumming  <murrayc murrayc com>
 
 	libglom: Added DbUtils::set_fake_connection().
diff --git a/configure.ac b/configure.ac
index bb26053..bd9757e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,9 +131,7 @@ AS_IF([test "x$glom_enable_postgresql" = xyes],
                  [Whether to enable support for PostgreSQL databases.])])
 
 # Libraries used by libglom:
-# TODO: Remove the need for gthread-2.0 when we can depend on giomm (or glibmm) 3.32,
-# because gthread-2.0 is then just an empty unnecessary library.
-REQUIRED_LIBGLOM_LIBS='gthread-2.0 giomm-2.4 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-postgres-5.0'
+REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 3.3.1 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-postgres-5.0'
 
 AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
diff --git a/glom/libglom/spawn_with_feedback.cc b/glom/libglom/spawn_with_feedback.cc
index 5cfe128..0689660 100644
--- a/glom/libglom/spawn_with_feedback.cc
+++ b/glom/libglom/spawn_with_feedback.cc
@@ -48,8 +48,8 @@ class CommandLineThreadData
 {
 public:
   std::string m_command;
-  Glib::Cond* m_cond;
-  Glib::Mutex* m_mutex;
+  Glib::Threads::Cond* m_cond;
+  Glib::Threads::Mutex* m_mutex;
   bool* m_result;
 };