following last commit, freshen up all ispect xml files with a on an updated archlinux box. also format all XML files to follow the same style (spacing/doctypes/etc)

3 files changed, 48 insertions, 66 deletions

diff --git a/conf/hostnamed-ispect.xml b/conf/hostnamed-ispect.xml
index 4bd4acd..bca38cf 100644
--- a/conf/hostnamed-ispect.xml
+++ b/conf/hostnamed-ispect.xml
@@ -1,38 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-    <interface name="org.freedesktop.DBus.Peer">
-        <method name="Ping" />
-        <method name="GetMachineId">
-            <arg type="s" name="machine_uuid" direction="out" />
-        </method>
-    </interface>
-    <interface name="org.freedesktop.DBus.Introspectable">
-        <method name="Introspect">
-            <arg name="data" type="s" direction="out" />
-        </method>
-    </interface>
-    <interface name="org.freedesktop.DBus.Properties">
-        <method name="Get">
-            <arg name="interface" direction="in" type="s" />
-            <arg name="property" direction="in" type="s" />
-            <arg name="value" direction="out" type="v" />
-        </method>
-        <method name="GetAll">
-            <arg name="interface" direction="in" type="s" />
-            <arg name="properties" direction="out" type="a{sv}" />
-        </method>
-        <method name="Set">
-            <arg name="interface" direction="in" type="s" />
-            <arg name="property" direction="in" type="s" />
-            <arg name="value" direction="in" type="v" />
-        </method>
-        <signal name="PropertiesChanged">
-            <arg type="s" name="interface" direction="in" />
-            <arg type="a{sv}" name="changed_properties" direction="in" />
-            <arg type="as" name="invalidated_properties" direction="in" />
-        </signal>
-    </interface>
     <interface name="org.freedesktop.hostname1">
         <property name="Hostname" type="s" access="read">
             <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
diff --git a/conf/localed-ispect.xml b/conf/localed-ispect.xml
index 46a7a36..7fa1dca 100644
--- a/conf/localed-ispect.xml
+++ b/conf/localed-ispect.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/freedesktop/locale1">
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
     <interface name="org.freedesktop.locale1">
+        <property name="Locale" type="as" access="read" />
+        <property name="X11Layout" type="s" access="read" />
+        <property name="X11Model" type="s" access="read" />
+        <property name="X11Variant" type="s" access="read" />
+        <property name="X11Options" type="s" access="read" />
+        <property name="VConsoleKeymap" type="s" access="read" />
+        <property name="VConsoleKeymapToggle" type="s" access="read" />
         <method name="SetLocale">
-            <arg direction="in" type="as" name="locale" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="as" direction="in" />
+            <arg type="b" direction="in" />
         </method>
         <method name="SetVConsoleKeyboard">
-            <arg direction="in" type="s" name="keymap" />
-            <arg direction="in" type="s" name="keymap_toggle" />
-            <arg direction="in" type="b" name="convert" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
         </method>
         <method name="SetX11Keyboard">
-            <arg direction="in" type="s" name="layout" />
-            <arg direction="in" type="s" name="model" />
-            <arg direction="in" type="s" name="variant" />
-            <arg direction="in" type="s" name="options" />
-            <arg direction="in" type="b" name="convert" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
         </method>
-        <property name="Locale" type="as" access="read" />
-        <property name="VConsoleKeymap" type="s" access="read" />
-        <property name="VConsoleKeymapToggle" type="s" access="read" />
-        <property name="X11Layout" type="s" access="read" />
-        <property name="X11Model" type="s" access="read" />
-        <property name="X11Variant" type="s" access="read" />
-        <property name="X11Options" type="s" access="read" />
     </interface>
 </node>
diff --git a/conf/timedated-ispect.xml b/conf/timedated-ispect.xml
index 48f2201..5dc44ff 100644
--- a/conf/timedated-ispect.xml
+++ b/conf/timedated-ispect.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/freedesktop/timedate1">
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
     <interface name="org.freedesktop.timedate1">
+        <property name="Timezone" type="s" access="read" />
+        <property name="LocalRTC" type="b" access="read" />
+        <property name="CanNTP" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="NTP" type="b" access="read" />
+        <property name="NTPSynchronized" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="TimeUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="RTCTimeUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
         <method name="SetTime">
-            <arg direction="in" type="x" name="usec_utc" />
-            <arg direction="in" type="b" name="relative" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="x" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
         </method>
         <method name="SetTimezone">
-            <arg direction="in" type="s" name="timezone" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
         </method>
         <method name="SetLocalRTC">
-            <arg direction="in" type="b" name="local_rtc" />
-            <arg direction="in" type="b" name="fix_system" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
         </method>
         <method name="SetNTP">
-            <arg direction="in" type="b" name="use_ntp" />
-            <arg direction="in" type="b" name="user_interaction" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
         </method>
-        <property name="Timezone" type="s" access="read" />
-        <property name="LocalRTC" type="b" access="read" />
-        <property name="NTP" type="b" access="read" />
     </interface>
 </node>