diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-17 23:01:37 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-17 23:01:37 +0000 |
| commit | a39901745760040aefe046da10e3841e05caa829 (patch) | |
| tree | 58ffa067227d0a1e6b58a6055a49f4aa3a11be5d /tests/test-dbus-listener.cc | |
| parent | 06c8a32dc8fdb3150bed5db3d8ee5919f070a810 (diff) | |
| parent | 5535cc541da4b436c662bef27589f5b929ed982e (diff) | |
| download | ayatana-indicator-power-a39901745760040aefe046da10e3841e05caa829.tar.gz ayatana-indicator-power-a39901745760040aefe046da10e3841e05caa829.tar.bz2 ayatana-indicator-power-a39901745760040aefe046da10e3841e05caa829.zip | |
g_type_init() is deprecated as of glib 2.35.4, so bump our glib minimum requirement and remove the g_type_init() call.
Approved by PS Jenkins bot.
Diffstat (limited to 'tests/test-dbus-listener.cc')
| -rw-r--r-- | tests/test-dbus-listener.cc | 19 |
1 files changed, 0 insertions, 19 deletions
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); |
