Skip to content

Commit

Permalink
src/timezone-geoclue.cpp: Blind shot at switching to Geoclue2 DBus API.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunweaver
sunweaver committed Dec 8, 2017
1 parent 111c622 commit da8cf48
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/timezone-geoclue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class GeoclueTimezone::Impl

g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
"/org/freedesktop/Geoclue/Master",
"org.freedesktop.Geoclue.Master",
"/org/freedesktop/Geoclue2/Master",
"org.freedesktop.Geoclue2.Master",
"Create",
nullptr, // parameters
G_VARIANT_TYPE("(o)"),
Expand All @@ -117,7 +117,7 @@ class GeoclueTimezone::Impl

auto tag = g_dbus_connection_signal_subscribe(self->m_bus,
GEOCLUE_BUS_NAME,
"org.freedesktop.Geoclue.Address", // interface
"org.freedesktop.Geoclue2.Address", // interface
"AddressChanged", // signal name
self->m_client_object_path.c_str(), // object path
nullptr, // arg0
Expand All @@ -130,7 +130,7 @@ class GeoclueTimezone::Impl
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
"org.freedesktop.Geoclue.MasterClient",
"org.freedesktop.Geoclue2.MasterClient",
"SetRequirements",
g_variant_new("(iibi)", 2, 0, FALSE, 1023),
nullptr,
Expand Down Expand Up @@ -164,7 +164,7 @@ class GeoclueTimezone::Impl
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
"org.freedesktop.Geoclue.MasterClient",
"org.freedesktop.Geoclue2.MasterClient",
"AddressStart",
nullptr,
nullptr,
Expand All @@ -189,7 +189,7 @@ class GeoclueTimezone::Impl
g_dbus_connection_call(self->m_bus,
GEOCLUE_BUS_NAME,
self->m_client_object_path.c_str(),
"org.freedesktop.Geoclue.Address",
"org.freedesktop.Geoclue2.Address",
"GetAddress",
nullptr,
G_VARIANT_TYPE("(ia{ss}(idd))"),
Expand Down

0 comments on commit da8cf48

Please sign in to comment.