From 557e10a031b886dc670bdf5918c3984edbace5ac Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Feb 2016 12:24:34 -0600 Subject: remove dead code --- src/notifier.c | 2 ++ tests/test-notify.cc | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/notifier.c b/src/notifier.c index 00a00e5..da5c5d5 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -311,7 +311,9 @@ notification_show(IndicatorPowerNotifier * self) if (are_actions_supported(self)) { + #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS if (!silent_mode(self)) + #endif { gchar* filename = datafile_find(DATAFILE_TYPE_SOUND, LOW_BATTERY_SOUND); if (filename != NULL) diff --git a/tests/test-notify.cc b/tests/test-notify.cc index d01ef5f..cd5b6f1 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -166,7 +166,6 @@ protected: int get_notify_call_count() const { - // confirm that we got exactly one call guint len {0u}; GError* error {nullptr}; dbus_test_dbus_mock_object_get_method_calls(mock, obj, METHOD_NOTIFY, &len, &error); @@ -444,7 +443,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) clear_method_calls(); // ...and that the warning is taken down if the battery is plugged back in... - //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, nullptr); wait_msec(); @@ -453,7 +451,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) EXPECT_EQ (0, get_notify_call_count()); // ...and that it comes back if we unplug again... - //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_DISCHARGING, nullptr); wait_msec(); @@ -464,7 +461,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) clear_method_calls(); // ...and that it's taken down if the power level is OK - //last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_low+1); wait_msec(); -- cgit v1.2.3