aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/timezone-geoclue.cpp2
-rw-r--r--tests/geoclue-fixture.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/timezone-geoclue.cpp b/src/timezone-geoclue.cpp
index abc91a3..816e075 100644
--- a/src/timezone-geoclue.cpp
+++ b/src/timezone-geoclue.cpp
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#define GEOCLUE_BUS_NAME "org.freedesktop.Geoclue2.Master"
+#define GEOCLUE_BUS_NAME "org.freedesktop.Geoclue.Master"
namespace ayatana {
namespace indicator {
diff --git a/tests/geoclue-fixture.h b/tests/geoclue-fixture.h
index cd12a02..a6641d6 100644
--- a/tests/geoclue-fixture.h
+++ b/tests/geoclue-fixture.h
@@ -47,24 +47,24 @@ class GeoclueFixture : public GlibFixture
super::SetUp();
GError * error = nullptr;
- const auto master_path = "/org/freedesktop/Geoclue2/Master";
- const auto client_path = "/org/freedesktop/Geoclue2/Master/client0";
+ const auto master_path = "/org/freedesktop/Geoclue/Master";
+ const auto client_path = "/org/freedesktop/Geoclue/Master/client0";
GString * gstr = g_string_new (nullptr);
service = dbus_test_service_new (nullptr);
- mock = dbus_test_dbus_mock_new ("org.freedesktop.Geoclue2.Master");
+ mock = dbus_test_dbus_mock_new ("org.freedesktop.Geoclue.Master");
- auto interface = "org.freedesktop.Geoclue2.Master";
+ auto interface = "org.freedesktop.Geoclue.Master";
obj_geo_m = dbus_test_dbus_mock_get_object (mock, master_path, interface, nullptr);
g_string_printf (gstr, "ret = '%s'", client_path);
dbus_test_dbus_mock_object_add_method (mock, obj_geo_m, "Create", nullptr, G_VARIANT_TYPE_OBJECT_PATH, gstr->str, &error);
- interface = "org.freedesktop.Geoclue2.MasterClient";
+ interface = "org.freedesktop.Geoclue.MasterClient";
obj_geo_mc = dbus_test_dbus_mock_get_object (mock, client_path, interface, nullptr);
dbus_test_dbus_mock_object_add_method (mock, obj_geo_mc, "SetRequirements", G_VARIANT_TYPE("(iibi)"), nullptr, "", &error);
dbus_test_dbus_mock_object_add_method (mock, obj_geo_mc, "AddressStart", nullptr, nullptr, "", &error);
- interface = "org.freedesktop.Geoclue2";
+ interface = "org.freedesktop.Geoclue";
obj_geo = dbus_test_dbus_mock_get_object (mock, client_path, interface, nullptr);
dbus_test_dbus_mock_object_add_method (mock, obj_geo, "AddReference", nullptr, nullptr, "", &error);
g_string_printf (gstr, "ret = (1385238033, {'timezone': '%s'}, (3, 0.0, 0.0))", timezone_1.c_str());
@@ -126,7 +126,7 @@ private:
GError * error = nullptr;
dbus_test_dbus_mock_object_emit_signal(data->mock, data->obj_geo_addr,
- //"org.freedesktop.Geoclue2.Address",
+ //"org.freedesktop.Geoclue.Address",
"AddressChanged",
G_VARIANT_TYPE("(ia{ss}(idd))"),
g_variant_new_parsed (fmt),