diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-05-24 11:32:16 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-05-24 11:32:16 -0500 |
| commit | f18b60b0ce389bee7fc4784b6714f28567397b42 (patch) | |
| tree | 67881e9a716a91db6d2fe59ef35cb0e58904a0cd | |
| parent | 4f74252ce9a8ae3e651cc9e61dc280da82f12d9b (diff) | |
| download | ayatana-indicator-power-f18b60b0ce389bee7fc4784b6714f28567397b42.tar.gz ayatana-indicator-power-f18b60b0ce389bee7fc4784b6714f28567397b42.tar.bz2 ayatana-indicator-power-f18b60b0ce389bee7fc4784b6714f28567397b42.zip | |
remove the g_clear_pointer() calls s.t. things will build and run on alesage's Jenkins setup running Precise
| -rw-r--r-- | tests/test-device.cc | 8 | ||||
| -rw-r--r-- | tests/test-indicator.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/test-device.cc b/tests/test-device.cc index 02516f4..4dde4af 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -45,7 +45,7 @@ TEST(DeviceTest, GObjectNew) GObject * o = G_OBJECT (g_object_new (INDICATOR_POWER_DEVICE_TYPE, NULL)); ASSERT_TRUE (o != NULL); ASSERT_TRUE (INDICATOR_IS_POWER_DEVICE(o)); - g_clear_pointer (&o, g_object_unref); + g_object_unref (o); } TEST(DeviceTest, New) @@ -68,7 +68,7 @@ TEST(DeviceTest, New) ASSERT_EQ (indicator_power_device_get_time(device), 30); /* cleanup */ - g_clear_pointer (&device, g_object_unref); + g_object_unref (device); } TEST(DeviceTest, NewFromVariant) @@ -94,6 +94,6 @@ TEST(DeviceTest, NewFromVariant) ASSERT_EQ (indicator_power_device_get_time(device), 30); /* cleanup */ - g_clear_pointer (&device, g_object_unref); - g_clear_pointer (&variant, g_variant_unref); + g_object_unref (device); + g_variant_unref (variant); } diff --git a/tests/test-indicator.cc b/tests/test-indicator.cc index 2f16176..e3533e9 100644 --- a/tests/test-indicator.cc +++ b/tests/test-indicator.cc @@ -47,6 +47,6 @@ TEST(IndicatorTest, GObjectNew) GObject * o = G_OBJECT (g_object_new (INDICATOR_POWER_TYPE, NULL)); ASSERT_TRUE (o != NULL); ASSERT_TRUE (IS_INDICATOR_POWER(o)); - g_clear_pointer (&o, g_object_unref); + g_object_unref (o); } |