The xml files are non-neeeded anymore as signond-dev provides all necessary informati...

diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am
index f2433c61a8ceddd04a0f76b3d698a95022130949..433d2b12f99d2eb17a38116e4be86de30c2175fb 100644 (file)
--- a/libsignon-glib/Makefile.am
+++ b/libsignon-glib/Makefile.am
@@ -45,13 +45,15 @@ libsignon_glib_include_HEADERS = \
        signon-errors.h \
        $(signon_headers)
 
-signon-client-glib-gen.h: signondaemon.xml
+DBUS_INTERFACES_DIR = /usr/share/dbus-1/interfaces
+
+signon-client-glib-gen.h: $(DBUS_INTERFACES_DIR)/com.nokia.SingleSignOn.AuthService.xml
        dbus-binding-tool --prefix=signon-client-glib --mode=glib-client $< > $@
 
-signon-auth-session-client-glib-gen.h: signonauthsession.xml
+signon-auth-session-client-glib-gen.h: $(DBUS_INTERFACES_DIR)/com.nokia.SingleSignOn.AuthSession.xml
        dbus-binding-tool --prefix=signon-auth-session-client-glib --mode=glib-client $< > $@
 
-signon-identity-glib-gen.h: signonidentity.xml
+signon-identity-glib-gen.h: $(DBUS_INTERFACES_DIR)/com.nokia.SingleSignOn.Identity.xml
        dbus-binding-tool --prefix=signon-identity-glib --mode=glib-client $< > $@
 
 %-marshal.h: %-marshal.list Makefile

diff --git a/libsignon-glib/signonauthsession.xml b/libsignon-glib/signonauthsession.xml
deleted file mode 100644 (file)
index 9de2ad5..0000000
--- a/libsignon-glib/signonauthsession.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!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="com.nokia.SingleSignOn.AuthSession">
-    <signal name="stateChanged">
-      <arg name="state" type="i" direction="out"/>
-      <arg name="message" type="s" direction="out"/>
-    </signal>
-    <signal name="unregistered">
-    </signal>
-    <method name="queryAvailableMechanisms">
-      <arg type="as" direction="out"/>
-      <arg name="wantedMechanisms" type="as" direction="in"/>
-    </method>
-    <method name="process">
-      <arg type="a{sv}" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-      <arg name="sessionDataVa" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-      <arg name="mechanism" type="s" direction="in"/>
-    </method>
-    <method name="cancel">
-    </method>
-    <method name="setId">
-      <arg name="id" type="u" direction="in"/>
-    </method>
-    <method name="objectUnref">
-    </method>
-  </interface>
-</node>

diff --git a/libsignon-glib/signondaemon.xml b/libsignon-glib/signondaemon.xml
deleted file mode 100644 (file)
index e36a4e6..0000000
--- a/libsignon-glib/signondaemon.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!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="com.nokia.SingleSignOn.AuthService">
-    <method name="registerNewIdentity">
-      <arg name="objectPath" type="o" direction="out"/>
-    </method>
-    <method name="registerStoredIdentity">
-      <arg name="id" type="u" direction="in"/>
-      <arg name="objectPath" type="o" direction="out"/>
-      <arg name="identityData" type="av" direction="out"/>
-    </method>
-    <method name="getAuthSessionObjectPath">
-      <arg type="s" direction="out"/>
-      <arg name="id" type="u" direction="in"/>
-      <arg name="type" type="s" direction="in"/>
-    </method>
-    <method name="queryMethods">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="queryMechanisms">
-      <arg type="as" direction="out"/>
-      <arg name="method" type="s" direction="in"/>
-    </method>
-    <method name="queryIdentities">
-      <arg type="av" direction="out"/>
-      <arg name="filter" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-    </method>
-    <method name="clear">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="setDeviceLockCode">
-      <arg type="b" direction="out"/>
-      <arg name="lockCode" type="ay" direction="in"/>
-      <arg name="oldLockCode" type="ay" direction="in"/>
-    </method>
-    <method name="remoteLock">
-      <arg type="b" direction="out"/>
-      <arg name="lockCode" type="ay" direction="in"/>
-    </method>
-    <method name="backupStarts">
-      <arg type="y" direction="out"/>
-    </method>
-    <method name="backupFinished">
-      <arg type="y" direction="out"/>
-    </method>
-    <method name="restoreStarts">
-      <arg type="y" direction="out"/>
-    </method>
-    <method name="restoreFinished">
-      <arg type="y" direction="out"/>
-    </method>
-  </interface>
-</node>
\ No newline at end of file

diff --git a/libsignon-glib/signonidentity.xml b/libsignon-glib/signonidentity.xml
deleted file mode 100644 (file)
index d4fcd74..0000000
--- a/libsignon-glib/signonidentity.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!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="com.nokia.SingleSignOn.Identity">
-    <signal name="unregistered">
-    </signal>
-    <signal name="infoUpdated">
-      <arg type="i" direction="out"/>
-    </signal>
-    <method name="requestCredentialsUpdate">
-      <arg type="u" direction="out"/>
-      <arg name="message" type="s" direction="in"/>
-    </method>
-    <method name="queryInfo">
-      <arg type="av" direction="out"/>
-    </method>
-    <method name="verifyUser">
-      <arg type="b" direction="out"/>
-      <arg name="message" type="s" direction="in"/>
-    </method>
-    <method name="verifySecret">
-      <arg type="b" direction="out"/>
-      <arg name="secret" type="s" direction="in"/>
-    </method>
-    <method name="remove">
-    </method>
-    <method name="signOut">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="storeCredentials">
-      <arg type="u" direction="out"/>
-      <arg name="id" type="u" direction="in"/>
-      <arg name="userName" type="s" direction="in"/>
-      <arg name="secret" type="s" direction="in"/>
-      <arg name="storeSecret" type="b" direction="in"/>
-      <arg name="methods" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In4" value="QVariantMap"/>
-      <arg name="caption" type="s" direction="in"/>
-      <arg name="realms" type="as" direction="in"/>
-      <arg name="accessControlList" type="as" direction="in"/>
-      <arg name="type" type="i" direction="in"/>
-    </method>
-  </interface>
-</node>
\ No newline at end of file