diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-09-04 21:17:12 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-09-04 21:17:12 +0200 |
| commit | 527bbe441c788bae626637d7c75b0603d08eceb4 (patch) | |
| tree | 3f5f484e69eb1daa45a2e1a4feba003cfbe9f0ed /tests/test-notify.cc | |
| parent | ca5a779dc20a5d33249a9298eb1ec834e63ecdee (diff) | |
| parent | 147130a91624079dbc6237d2426f122e0f6513e6 (diff) | |
| download | ayatana-indicator-power-527bbe441c788bae626637d7c75b0603d08eceb4.tar.gz ayatana-indicator-power-527bbe441c788bae626637d7c75b0603d08eceb4.tar.bz2 ayatana-indicator-power-527bbe441c788bae626637d7c75b0603d08eceb4.zip | |
Merge branch 'tari01-pr/deprecations-warnings'
Attributes GH PR #14: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/14
Diffstat (limited to 'tests/test-notify.cc')
| -rw-r--r-- | tests/test-notify.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-notify.cc b/tests/test-notify.cc index a7e2beb..63214c2 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -88,8 +88,8 @@ protected: NOTIFY_INTERFACE, &error); g_assert_no_error (error); - - // METHOD_GET_INFO + + // METHOD_GET_INFO dbus_test_dbus_mock_object_add_method(mock, obj, METHOD_GET_INFO, nullptr, G_VARIANT_TYPE("(ssss)"), @@ -113,7 +113,7 @@ protected: g_assert_no_error (error); g_free (str); - // METHOD_CLOSE + // METHOD_CLOSE str = g_strdup_printf("self.EmitSignal('%s', '%s', 'uu', [ args[0], %d ])", NOTIFY_INTERFACE, SIGNAL_CLOSED, @@ -150,8 +150,8 @@ protected: while ((bus != nullptr) && (cleartry < 50)) { g_usleep(100000); - while (g_main_pending()) - g_main_iteration(true); + while (g_main_context_pending(NULL)) + g_main_context_iteration(NULL, true); cleartry++; } @@ -293,7 +293,7 @@ TEST_F(NotifyFixture, LevelsDuringBatteryDrain) nullptr); // confirm that draining the battery puts - // the power_level change through its paces + // the power_level change through its paces for (int i=100; i>=0; --i) { changed_params = ChangedParams(); |