From 5535cc541da4b436c662bef27589f5b929ed982e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 17 Jan 2013 15:07:08 -0600
Subject: remove g_type_init() calls and bump glib minimum to 2.35.4, where
 g_type_init() is deprecated

---
 tests/test-dbus-listener.cc | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'tests/test-dbus-listener.cc')

diff --git a/tests/test-dbus-listener.cc b/tests/test-dbus-listener.cc
index 8bf74bf..7764498 100644
--- a/tests/test-dbus-listener.cc
+++ b/tests/test-dbus-listener.cc
@@ -26,24 +26,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 ****
 ***/
 
-namespace
-{
-  void ensure_glib_initialized ()
-  {
-    static bool initialized = false;
-
-    if (G_UNLIKELY(!initialized))
-    {
-      initialized = true;
-      g_type_init();
-    }
-  }
-}
-
-/***
-****
-***/
-
 class DbusListenerTest : public ::testing::Test
 {
   protected:
@@ -138,7 +120,6 @@ class DbusListenerTest : public ::testing::Test
       gsd_power_error_string = NULL;
 
       // bring up the test bus
-      ensure_glib_initialized ();
       mainloop =  g_main_loop_new (NULL, FALSE);
       bus = g_test_dbus_new (G_TEST_DBUS_NONE);
       g_test_dbus_up (bus);
-- 
cgit v1.2.3