aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-28 08:29:36 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-28 08:29:36 +0200
commit58f80cae9b075a1ba44bfd70fa6810fc9800112a (patch)
tree83da9ba74540a346294b6eadf19f7f662de4448a
parent59c33e407010f6b0f550b88dd0e9318db91db200 (diff)
parentd4210a27d9ed8c519666d219999e98e630cc4e2d (diff)
downloadayatana-indicator-datetime-main.tar.gz
ayatana-indicator-datetime-main.tar.bz2
ayatana-indicator-datetime-main.zip
Merge branch 'tari01-pr/remove-usensord'HEADmain
Attributes GH PR #66: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/66
-rw-r--r--include/notifications/dbus-shared.h9
-rw-r--r--src/haptic.cpp7
-rw-r--r--tests/notification-fixture.h4
3 files changed, 14 insertions, 6 deletions
diff --git a/include/notifications/dbus-shared.h b/include/notifications/dbus-shared.h
index 31df219..ea47328 100644
--- a/include/notifications/dbus-shared.h
+++ b/include/notifications/dbus-shared.h
@@ -1,5 +1,6 @@
/*
* Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -16,6 +17,7 @@
* Authors:
* Ted Gould <ted@canonical.com>
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#ifndef AYATANA_INDICATOR_NOTIFICATIONS_DBUS_SHARED_H
@@ -29,8 +31,9 @@
#define BUS_POWERD_PATH "/com/lomiri/Repowerd"
#define BUS_POWERD_INTERFACE "com.lomiri.Repowerd"
-#define BUS_HAPTIC_NAME "com.canonical.usensord"
-#define BUS_HAPTIC_PATH "/com/canonical/usensord/haptic"
-#define BUS_HAPTIC_INTERFACE "com.canonical.usensord.haptic"
+//TODO: Reimplement using hfd-service
+//#define BUS_HAPTIC_NAME ""
+//#define BUS_HAPTIC_PATH ""
+//#define BUS_HAPTIC_INTERFACE ""
#endif /* INDICATOR_NOTIFICATIONS_DBUS_SHARED_H */
diff --git a/src/haptic.cpp b/src/haptic.cpp
index dc2cb82..d794ba7 100644
--- a/src/haptic.cpp
+++ b/src/haptic.cpp
@@ -1,5 +1,6 @@
/*
* Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#include <notifications/dbus-shared.h>
@@ -130,7 +132,8 @@ private:
g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&builder, pattern_array);
g_variant_builder_add_value (&builder, repeat_count);
- auto vibrate_pattern_args = g_variant_builder_end (&builder);
+ //TODO: Reimplement using hfd-service
+ /*auto vibrate_pattern_args = g_variant_builder_end (&builder);
g_dbus_connection_call (m_bus,
BUS_HAPTIC_NAME,
@@ -143,7 +146,7 @@ private:
-1,
m_cancellable,
nullptr,
- nullptr);
+ nullptr);*/
}
const Mode m_mode;
diff --git a/tests/notification-fixture.h b/tests/notification-fixture.h
index f94dd69..5024792 100644
--- a/tests/notification-fixture.h
+++ b/tests/notification-fixture.h
@@ -279,6 +279,8 @@ protected:
g_assert_no_error (error);
dbus_test_service_add_task(service, DBUS_TEST_TASK(screen_mock));
+ //TODO: Reimplement using hfd-service
+ /*
///
/// Add the haptic mock
///
@@ -296,7 +298,7 @@ protected:
"",
&error);
g_assert_no_error (error);
- dbus_test_service_add_task(service, DBUS_TEST_TASK(haptic_mock));
+ dbus_test_service_add_task(service, DBUS_TEST_TASK(haptic_mock));*/
startDbusMock();
}