aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-26 10:33:36 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-26 10:33:36 +0200
commit8dbc66cab4eadfdde3809340d03c4cc10b2032eb (patch)
treeb03069533b44be4d5bb10372ea7a460d1dfc781b
parentb16069da49970a7875763a9fd12134f61f6d4502 (diff)
downloadayatana-indicator-datetime-8dbc66cab4eadfdde3809340d03c4cc10b2032eb.tar.gz
ayatana-indicator-datetime-8dbc66cab4eadfdde3809340d03c4cc10b2032eb.tar.bz2
ayatana-indicator-datetime-8dbc66cab4eadfdde3809340d03c4cc10b2032eb.zip
Revert "src/timezone-geoclue.cpp: Blind shot at switching to Geoclue2 DBus API."
This reverts commit da8cf48c91fafd2428113f67645fa5ceeb713e0d.
-rw-r--r--src/timezone-geoclue.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/timezone-geoclue.cpp b/src/timezone-geoclue.cpp
index 816e075..50ebbcd 100644
--- a/src/timezone-geoclue.cpp
+++ b/src/timezone-geoclue.cpp
@@ -89,8 +89,8 @@ private:
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
- "/org/freedesktop/Geoclue2/Master",
- "org.freedesktop.Geoclue2.Master",
+ "/org/freedesktop/Geoclue/Master",
+ "org.freedesktop.Geoclue.Master",
"Create",
nullptr, // parameters
G_VARIANT_TYPE("(o)"),
@@ -117,7 +117,7 @@ private:
auto tag = g_dbus_connection_signal_subscribe(self->m_bus,
GEOCLUE_BUS_NAME,
- "org.freedesktop.Geoclue2.Address", // interface
+ "org.freedesktop.Geoclue.Address", // interface
"AddressChanged", // signal name
self->m_client_object_path.c_str(), // object path
nullptr, // arg0
@@ -130,7 +130,7 @@ private:
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
- "org.freedesktop.Geoclue2.MasterClient",
+ "org.freedesktop.Geoclue.MasterClient",
"SetRequirements",
g_variant_new("(iibi)", 2, 0, FALSE, 1023),
nullptr,
@@ -164,7 +164,7 @@ private:
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
- "org.freedesktop.Geoclue2.MasterClient",
+ "org.freedesktop.Geoclue.MasterClient",
"AddressStart",
nullptr,
nullptr,
@@ -189,7 +189,7 @@ private:
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
- "org.freedesktop.Geoclue2.Address",
+ "org.freedesktop.Geoclue.Address",
"GetAddress",
nullptr,
G_VARIANT_TYPE("(ia{ss}(idd))"),