From 8b42a4928a0a266c3b3ae6bb13997764bc7f6405 Mon Sep 17 00:00:00 2001
From: William Jon McCann <mccann@jhu.edu>
Date: Tue, 13 Mar 2007 03:42:04 -0400
Subject: add the last bits of spec framework

The spec is the introspection format extended with
docs.  There are tools to build docbook and strip
the docs to make dbus introspect xml.
---
 src/ck-manager.xml | 16 +++++-----------
 src/ck-seat.xml    | 14 ++++----------
 src/ck-session.xml | 11 ++---------
 3 files changed, 11 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/ck-manager.xml b/src/ck-manager.xml
index ced06b0..5dc9213 100644
--- a/src/ck-manager.xml
+++ b/src/ck-manager.xml
@@ -1,8 +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 name="/org/freedesktop/ConsoleKit/Manager">
-
   <interface name="org.freedesktop.ConsoleKit.Manager">
-
     <method name="OpenSession">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="cookie" direction="out" type="s"/>
@@ -17,15 +15,9 @@
       <arg name="cookie" direction="in" type="s"/>
       <arg name="result" direction="out" type="b"/>
     </method>
-
     <method name="GetSeats">
       <arg name="seats" direction="out" type="ao"/>
     </method>
-
-    <method name="GetCurrentSession">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="ssid" direction="out" type="o"/>
-    </method>
     <method name="GetSessionForCookie">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="cookie" direction="in" type="s"/>
@@ -36,19 +28,21 @@
       <arg name="pid" direction="in" type="u"/>
       <arg name="ssid" direction="out" type="o"/>
     </method>
+    <method name="GetCurrentSession">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="ssid" direction="out" type="o"/>
+    </method>
     <method name="GetSessionsForUser">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="uid" direction="in" type="u"/>
       <arg name="sessions" direction="out" type="ao"/>
     </method>
-
     <method name="GetSystemIdleHint">
       <arg name="idle_hint" type="b" direction="out"/>
     </method>
     <method name="GetSystemIdleSinceHint">
       <arg name="iso8601_datetime" type="s" direction="out"/>
     </method>
-
     <signal name="SeatAdded">
       <arg name="sid" type="o"/>
     </signal>
diff --git a/src/ck-seat.xml b/src/ck-seat.xml
index 3e7a0fa..c6d3ed6 100644
--- a/src/ck-seat.xml
+++ b/src/ck-seat.xml
@@ -1,33 +1,27 @@
-<?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.ConsoleKit.Seat">
-
     <method name="GetId">
       <arg name="sid" direction="out" type="o"/>
     </method>
-
     <method name="GetSessions">
       <arg name="sessions" direction="out" type="ao"/>
     </method>
-
     <method name="GetActiveSession">
       <arg name="ssid" direction="out" type="o"/>
     </method>
-
     <method name="ActivateSession">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="ssid" direction="in" type="o"/>
     </method>
-
     <signal name="ActiveSessionChanged">
-      <arg name="sid" type="o"/>
+      <arg name="ssid" type="o"/>
     </signal>
     <signal name="SessionAdded">
-      <arg name="sid" type="o"/>
+      <arg name="ssid" type="o"/>
     </signal>
     <signal name="SessionRemoved">
-      <arg name="sid" type="o"/>
+      <arg name="ssid" type="o"/>
     </signal>
   </interface>
 </node>
diff --git a/src/ck-session.xml b/src/ck-session.xml
index 05df4ed..5699c04 100644
--- a/src/ck-session.xml
+++ b/src/ck-session.xml
@@ -1,8 +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.ConsoleKit.Session">
-
     <method name="GetId">
       <arg name="ssid" direction="out" type="o"/>
     </method>
@@ -19,7 +17,7 @@
       <arg name="display" direction="out" type="s"/>
     </method>
     <method name="GetX11DisplayDevice">
-       <arg name="x11_display_device" direction="out" type="s"/>
+      <arg name="x11_display_device" direction="out" type="s"/>
     </method>
     <method name="GetDisplayDevice">
       <arg name="display_device" direction="out" type="s"/>
@@ -36,7 +34,6 @@
     <method name="GetCreationTime">
       <arg name="iso8601_datetime" type="s" direction="out"/>
     </method>
-
     <method name="Activate">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
     </method>
@@ -46,7 +43,6 @@
     <method name="Unlock">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
     </method>
-
     <method name="GetIdleHint">
       <arg name="idle_hint" type="b" direction="out"/>
     </method>
@@ -57,7 +53,6 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="idle_hint" type="b" direction="in"/>
     </method>
-
     <signal name="ActiveChanged">
       <arg name="is_active" type="b"/>
     </signal>
@@ -66,7 +61,6 @@
     </signal>
     <signal name="Lock"/>
     <signal name="Unlock"/>
-
     <property name="user" type="u" access="readwrite"/>
     <property name="session-type" type="s" access="readwrite"/>
     <property name="remote-host-name" type="s" access="readwrite"/>
@@ -76,6 +70,5 @@
     <property name="active" type="b" access="readwrite"/>
     <property name="is-local" type="b" access="readwrite"/>
     <property name="idle-hint" type="b" access="readwrite"/>
-
   </interface>
 </node>
-- 
cgit