[glom] Remove code to initialize glib thread support.



commit 7ea2ce9284304b84887e8c5c487c8f67dac072e4
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 6 09:49:41 2013 +0100

    Remove code to initialize glib thread support.
    
    * glom/libglom/init.cc:
    * tests/import/test_parsing.cc:
    * tests/import/test_signals.cc: We depend on a new-enough glib now,
      so we do not need this.

 glom/libglom/init.cc         |    7 ++-----
 tests/import/test_parsing.cc |    4 +---
 tests/import/test_signals.cc |    4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/glom/libglom/init.cc b/glom/libglom/init.cc
index 6f8c9ae..ad4a355 100644
--- a/glom/libglom/init.cc
+++ b/glom/libglom/init.cc
@@ -47,11 +47,8 @@ namespace Glom
 void libglom_init()
 {
   //Threading is always enabled starting from GLib 2.31.0:
-  //TODO: Just remove this when we can increase the glibmm version needed:
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  if(!Glib::thread_supported())
-    Glib::thread_init(0); //So we can use GMutex.
-#endif
+  //if(!Glib::thread_supported())
+  //Glib::thread_init(0); //So we can use GMutex.
 
   Gnome::Gda::init();
   Gio::init();
diff --git a/tests/import/test_parsing.cc b/tests/import/test_parsing.cc
index 5721fd5..d7a99bf 100644
--- a/tests/import/test_parsing.cc
+++ b/tests/import/test_parsing.cc
@@ -90,9 +90,7 @@ int main()
 {
   //Threading is always enabled starting from GLib 2.31.0:
   //TODO: Just remove this when we can increase the glibmm version needed:
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  Glib::thread_init();
-#endif
+  //Glib::thread_init();
 
   Glib::init();
   Gio::init();
diff --git a/tests/import/test_signals.cc b/tests/import/test_signals.cc
index d0bc98d..c038dab 100644
--- a/tests/import/test_signals.cc
+++ b/tests/import/test_signals.cc
@@ -60,9 +60,7 @@ int main()
 {
   //Threading is always enabled starting from GLib 2.31.0:
   //TODO: Just remove this when we can increase the glibmm version needed:
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  Glib::thread_init();
-#endif
+  //Glib::thread_init();
 
   Glib::init();
   Gio::init();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]