From 5aa7f69535819ac8123a0444d15ead603fb57ce4 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 11 Mar 2014 08:08:28 +0100
Subject: [PATCH] Move dbus interface xml files to their canonical location

Install them to /usr/share/dbus-1/interfaces/.

At the same time, also rename the files as per convention: instead of
geoclue-interface.xml and geoclue-agent-interface.xml, rename them to
org.freedesktop.GeoClue2.xml and org.freedesktop.GeoClue2.Agent.xml,
respectfully.

This shouldn't require any changes in apps using geoclue since they use
pkgconfig to get the paths of the interface descrition files.

https://bugs.freedesktop.org/show_bug.cgi?id=76004
---
 src/Makefile.am                              |   4 +-
 src/agent/Makefile.am                        |   4 +-
 src/agent/geoclue-agent-interface.xml        |  49 --------
 src/agent/org.freedesktop.GeoClue2.Agent.xml |  49 ++++++++
 src/geoclue-interface.xml                    | 179 ---------------------------
 src/geoclue.pc.in                            |   4 +-
 src/org.freedesktop.GeoClue2.xml             | 179 +++++++++++++++++++++++++++
 7 files changed, 234 insertions(+), 234 deletions(-)
 delete mode 100644 src/agent/geoclue-agent-interface.xml
 create mode 100644 src/agent/org.freedesktop.GeoClue2.Agent.xml
 delete mode 100644 src/geoclue-interface.xml
 create mode 100644 src/org.freedesktop.GeoClue2.xml

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e044c5..b216333 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,8 @@ if BUILD_GEOIP_SERVER
 SUBDIRS += geoip-server
 endif # BUILD_GEOIP_SERVER
 
-interfacedir = $(datadir)/geoclue-$(GEOCLUE_API_VERSION)
-interface_DATA = geoclue-interface.xml
+interfacedir = $(datadir)/dbus-1/interfaces
+interface_DATA = org.freedesktop.GeoClue2.xml
 
 dbus_built_sources = geoclue-interface.c geoclue-interface.h
 geoclue-interface.c: geoclue-interface.h
diff --git a/src/agent/Makefile.am b/src/agent/Makefile.am
index 8770628..e8466c7 100644
--- a/src/agent/Makefile.am
+++ b/src/agent/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-interfacedir = $(datadir)/geoclue-2.0
-interface_DATA = geoclue-agent-interface.xml
+interfacedir = $(datadir)/dbus-1/interfaces
+interface_DATA = org.freedesktop.GeoClue2.Agent.xml
 
 docs-org.freedesktop.GeoClue2.Agent.xml: Makefile.am $(interface_DATA)
 	$(AM_V_GEN)$(GDBUS_CODEGEN) \
diff --git a/src/agent/geoclue-agent-interface.xml b/src/agent/geoclue-agent-interface.xml
deleted file mode 100644
index e8217df..0000000
--- a/src/agent/geoclue-agent-interface.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
-<!--
-    GeoClue 2.0 Agent Interface Specification
-
-    Copyright (C) 2014 Red Hat, Inc.
--->
-
-<node>
-
-  <!--
-      org.freedesktop.GeoClue2.Agent:
-      @short_description: The GeoClue agent interface
-
-      This is the interface all application-authorizing agents must implement.
-      There must be a separate agent object for every logged-in user on path
-      "/org/freedesktop/GeoClue2/Agent".
-  -->
-  <interface name="org.freedesktop.GeoClue2.Agent">
-
-    <!--
-        AuthorizeApp:
-        @desktop_id: The desktop file id (the basename of the desktop file) of the application requesting location information.
-        @req_accuracy_level: The level of location accuracy requested by client, as <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
-        @authorized: Return value indicating if application should be given location information or not.
-        @allowed_accuracy_level: The level of location accuracy allowed for client, as <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
-
-        This is the method that will be called by geoclue to get applications
-        authorized to be given location information.
-    -->
-    <method name="AuthorizeApp">
-      <arg name="desktop_id" type="s" direction="in"/>
-      <arg name="req_accuracy_level" type="u" direction="in"/>
-      <arg name="authorized" type="b" direction="out"/>
-      <arg name="allowed_accuracy_level" type="u" direction="out"/>
-    </method>
-
-    <!--
-        MaxAccuracyLevel:
-
-        The global maximum level of accuracy allowed for all clients. Since
-        agents are per-user, this can be different for each user. See
-        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link> for
-        possible values.
-    -->
-    <property name="MaxAccuracyLevel" type="u" access="read"/>
-  </interface>
-</node>
diff --git a/src/agent/org.freedesktop.GeoClue2.Agent.xml b/src/agent/org.freedesktop.GeoClue2.Agent.xml
new file mode 100644
index 0000000..e8217df
--- /dev/null
+++ b/src/agent/org.freedesktop.GeoClue2.Agent.xml
@@ -0,0 +1,49 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<!--
+    GeoClue 2.0 Agent Interface Specification
+
+    Copyright (C) 2014 Red Hat, Inc.
+-->
+
+<node>
+
+  <!--
+      org.freedesktop.GeoClue2.Agent:
+      @short_description: The GeoClue agent interface
+
+      This is the interface all application-authorizing agents must implement.
+      There must be a separate agent object for every logged-in user on path
+      "/org/freedesktop/GeoClue2/Agent".
+  -->
+  <interface name="org.freedesktop.GeoClue2.Agent">
+
+    <!--
+        AuthorizeApp:
+        @desktop_id: The desktop file id (the basename of the desktop file) of the application requesting location information.
+        @req_accuracy_level: The level of location accuracy requested by client, as <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
+        @authorized: Return value indicating if application should be given location information or not.
+        @allowed_accuracy_level: The level of location accuracy allowed for client, as <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
+
+        This is the method that will be called by geoclue to get applications
+        authorized to be given location information.
+    -->
+    <method name="AuthorizeApp">
+      <arg name="desktop_id" type="s" direction="in"/>
+      <arg name="req_accuracy_level" type="u" direction="in"/>
+      <arg name="authorized" type="b" direction="out"/>
+      <arg name="allowed_accuracy_level" type="u" direction="out"/>
+    </method>
+
+    <!--
+        MaxAccuracyLevel:
+
+        The global maximum level of accuracy allowed for all clients. Since
+        agents are per-user, this can be different for each user. See
+        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link> for
+        possible values.
+    -->
+    <property name="MaxAccuracyLevel" type="u" access="read"/>
+  </interface>
+</node>
diff --git a/src/geoclue-interface.xml b/src/geoclue-interface.xml
deleted file mode 100644
index 1f8bb57..0000000
--- a/src/geoclue-interface.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
-<!--
-    GeoClue 2.0 Interface Specification
-
-    Copyright (C) 2013 Red Hat, Inc.
--->
-
-<node>
-
-  <!--
-      org.freedesktop.GeoClue2.Manager:
-      @short_description: The GeoClue service manager
-
-      This is the interface you use to talk to main GeoClue2 manager object at
-      path "/org/freedesktop/GeoClue2/Manager". The only thing you do with this
-      interface is to call org.freedesktop.GeoClue2.Manager.GetClient() on it
-      to get your application specific client object.
-  -->
-  <interface name="org.freedesktop.GeoClue2.Manager">
-    <!--
-        InUse:
-
-        Whether service is currently is use by any application.
-    -->
-    <property name="InUse" type="b" access="read"/>
-
-    <!--
-        AvailableAccuracyLevel:
-
-        The level of available accuracy, as
-        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
-    -->
-    <property name="AvailableAccuracyLevel" type="u" access="read"/>
-
-    <!--
-        GetClient:
-        @client: The path for newly created client object
-
-        Retrieves a client object which can only be used by the calling
-        application only.
-    -->
-    <method name="GetClient">
-      <arg name="client" type="o" direction="out"/>
-    </method>
-
-    <!--
-        AddAgent:
-        @id: The Desktop ID (excluding .desktop) of the agent
-
-        An API for user authorization agents to register themselves. Each agent
-        is responsible for the user it is running as. Application developers
-        can and should simply ignore this API.
-    -->
-    <method name="AddAgent">
-      <arg name="id" type="s" direction="in"/>
-    </method>
-  </interface>
-
-  <!--
-      org.freedesktop.GeoClue2.Client:
-      @short_description: The Application-specific client API
-
-      This is the interface you use to retrieve location information and receive
-      location update signals from GeoClue service. You get the client object to
-      use this interface on from org.freedesktop.GeoClue2.Manager.GetClient()
-      method.
-  -->
-  <interface name="org.freedesktop.GeoClue2.Client">
-    <!--
-        Location:
-
-        Current location as path to a #org.freedesktop.GeoClue2.Location object.
-    -->
-    <property name="Location" type="o" access="read"/>
-
-    <!--
-        DistanceThreshold:
-
-        Contains the current distance threshold in meters. This value is used
-        by the service when it gets new location info. If the distance moved is
-        below the threshold, it won't emit the LocationUpdated signal.
-    -->
-    <property name="DistanceThreshold" type="u" access="readwrite"/>
-
-    <!--
-        DesktopId:
-
-        The desktop file id (the basename of the desktop file). This property
-        must be set by applications for authorization to work.
-    -->
-    <property name="DesktopId" type="s" access="readwrite"/>
-
-    <!--
-        RequestedAccuracyLevel:
-
-        The level of accuracy requested by client, as
-        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
-
-        Please keep in mind that the actual accuracy of location information is
-        dependent on available hardware on your machine, external resources
-        and/or how much accuracy user agrees to be confortable with.
-    -->
-    <property name="RequestedAccuracyLevel" type="u" access="readwrite"/>
-
-    <!--
-        Start:
-
-        Start receiving events about the current location. Applications should
-        hook-up to #org.freedesktop.GeoClue2.Client::LocationUpdated signal
-        before calling this method.
-    -->
-    <method name="Start"/>
-
-    <!--
-        Stop:
-
-        Stop receiving events about the current location.
-    -->
-    <method name="Stop"/>
-
-    <!--
-        LocationUpdated:
-        @old: old location as path to a #org.freedesktop.GeoClue2.Location object
-        @new: new location as path to a #org.freedesktop.GeoClue2.Location object
-
-        The signal is emitted every time the location changes.
-        The client should set the DistanceThreshold property to control how
-        often this signal is emitted.
-    -->
-    <signal name="LocationUpdated">
-      <arg name="old" type="o"/>
-      <arg name="new" type="o"/>
-    </signal>
-  </interface>
-
-  <!--
-      org.freedesktop.GeoClue2.Location:
-      @short_description: The Location interface
-
-      This is the interface you use on location objects.
-  -->
-  <interface name="org.freedesktop.GeoClue2.Location">
-
-    <!--
-        Latitude:
-
-        The latitude of the location, in degrees.
-    -->
-    <property name="Latitude" type="d" access="read"/>
-
-    <!--
-        Longitude:
-
-        The longitude of the location, in degrees.
-    -->
-    <property name="Longitude" type="d" access="read"/>
-
-    <!--
-        Accuracy:
-
-        The accuracy of the location fix, in meters.
-    -->
-    <property name="Accuracy" type="d" access="read"/>
-
-    <!--
-        Description:
-
-        A human-readable description of the location, if available.
-
-        WARNING: Applications should not rely on this property since not all
-        sources provide a description. If you really need a description (or
-        more details) about current location, use a reverse-geocoding API, e.g
-        geocode-glib.
-    -->
-    <property name="Description" type="s" access="read"/>
-  </interface>
-</node>
diff --git a/src/geoclue.pc.in b/src/geoclue.pc.in
index bfd7b8e..fbb5c1e 100644
--- a/src/geoclue.pc.in
+++ b/src/geoclue.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 
-dbus_interface=${datadir}/geoclue-2.0/geoclue-interface.xml
-agent_dbus_interface=${datadir}/geoclue-2.0/geoclue-agent-interface.xml
+dbus_interface=${datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2.xml
+agent_dbus_interface=${datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2.Agent.xml
 
 Name: Geoclue
 Description: The Geoinformation Service
diff --git a/src/org.freedesktop.GeoClue2.xml b/src/org.freedesktop.GeoClue2.xml
new file mode 100644
index 0000000..1f8bb57
--- /dev/null
+++ b/src/org.freedesktop.GeoClue2.xml
@@ -0,0 +1,179 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<!--
+    GeoClue 2.0 Interface Specification
+
+    Copyright (C) 2013 Red Hat, Inc.
+-->
+
+<node>
+
+  <!--
+      org.freedesktop.GeoClue2.Manager:
+      @short_description: The GeoClue service manager
+
+      This is the interface you use to talk to main GeoClue2 manager object at
+      path "/org/freedesktop/GeoClue2/Manager". The only thing you do with this
+      interface is to call org.freedesktop.GeoClue2.Manager.GetClient() on it
+      to get your application specific client object.
+  -->
+  <interface name="org.freedesktop.GeoClue2.Manager">
+    <!--
+        InUse:
+
+        Whether service is currently is use by any application.
+    -->
+    <property name="InUse" type="b" access="read"/>
+
+    <!--
+        AvailableAccuracyLevel:
+
+        The level of available accuracy, as
+        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
+    -->
+    <property name="AvailableAccuracyLevel" type="u" access="read"/>
+
+    <!--
+        GetClient:
+        @client: The path for newly created client object
+
+        Retrieves a client object which can only be used by the calling
+        application only.
+    -->
+    <method name="GetClient">
+      <arg name="client" type="o" direction="out"/>
+    </method>
+
+    <!--
+        AddAgent:
+        @id: The Desktop ID (excluding .desktop) of the agent
+
+        An API for user authorization agents to register themselves. Each agent
+        is responsible for the user it is running as. Application developers
+        can and should simply ignore this API.
+    -->
+    <method name="AddAgent">
+      <arg name="id" type="s" direction="in"/>
+    </method>
+  </interface>
+
+  <!--
+      org.freedesktop.GeoClue2.Client:
+      @short_description: The Application-specific client API
+
+      This is the interface you use to retrieve location information and receive
+      location update signals from GeoClue service. You get the client object to
+      use this interface on from org.freedesktop.GeoClue2.Manager.GetClient()
+      method.
+  -->
+  <interface name="org.freedesktop.GeoClue2.Client">
+    <!--
+        Location:
+
+        Current location as path to a #org.freedesktop.GeoClue2.Location object.
+    -->
+    <property name="Location" type="o" access="read"/>
+
+    <!--
+        DistanceThreshold:
+
+        Contains the current distance threshold in meters. This value is used
+        by the service when it gets new location info. If the distance moved is
+        below the threshold, it won't emit the LocationUpdated signal.
+    -->
+    <property name="DistanceThreshold" type="u" access="readwrite"/>
+
+    <!--
+        DesktopId:
+
+        The desktop file id (the basename of the desktop file). This property
+        must be set by applications for authorization to work.
+    -->
+    <property name="DesktopId" type="s" access="readwrite"/>
+
+    <!--
+        RequestedAccuracyLevel:
+
+        The level of accuracy requested by client, as
+        <link linkend="GClueAccuracyLevel">GClueAccuracyLevel</link>.
+
+        Please keep in mind that the actual accuracy of location information is
+        dependent on available hardware on your machine, external resources
+        and/or how much accuracy user agrees to be confortable with.
+    -->
+    <property name="RequestedAccuracyLevel" type="u" access="readwrite"/>
+
+    <!--
+        Start:
+
+        Start receiving events about the current location. Applications should
+        hook-up to #org.freedesktop.GeoClue2.Client::LocationUpdated signal
+        before calling this method.
+    -->
+    <method name="Start"/>
+
+    <!--
+        Stop:
+
+        Stop receiving events about the current location.
+    -->
+    <method name="Stop"/>
+
+    <!--
+        LocationUpdated:
+        @old: old location as path to a #org.freedesktop.GeoClue2.Location object
+        @new: new location as path to a #org.freedesktop.GeoClue2.Location object
+
+        The signal is emitted every time the location changes.
+        The client should set the DistanceThreshold property to control how
+        often this signal is emitted.
+    -->
+    <signal name="LocationUpdated">
+      <arg name="old" type="o"/>
+      <arg name="new" type="o"/>
+    </signal>
+  </interface>
+
+  <!--
+      org.freedesktop.GeoClue2.Location:
+      @short_description: The Location interface
+
+      This is the interface you use on location objects.
+  -->
+  <interface name="org.freedesktop.GeoClue2.Location">
+
+    <!--
+        Latitude:
+
+        The latitude of the location, in degrees.
+    -->
+    <property name="Latitude" type="d" access="read"/>
+
+    <!--
+        Longitude:
+
+        The longitude of the location, in degrees.
+    -->
+    <property name="Longitude" type="d" access="read"/>
+
+    <!--
+        Accuracy:
+
+        The accuracy of the location fix, in meters.
+    -->
+    <property name="Accuracy" type="d" access="read"/>
+
+    <!--
+        Description:
+
+        A human-readable description of the location, if available.
+
+        WARNING: Applications should not rely on this property since not all
+        sources provide a description. If you really need a description (or
+        more details) about current location, use a reverse-geocoding API, e.g
+        geocode-glib.
+    -->
+    <property name="Description" type="s" access="read"/>
+  </interface>
+</node>
-- 
1.9.0