Commit 7689e472 authored by Corentin Noël's avatar Corentin Noël

Use the Signon interface

parent d1bae907
Pipeline #29789132 failed with stages
in 4 minutes and 34 seconds
......@@ -33,9 +33,9 @@ BUILT_SOURCES = \
CLEANFILES = \
$(BUILT_SOURCES) \
sso-auth-service-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \
sso-auth-session-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml \
sso-identity-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.Identity.xml
sso-auth-service-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthService.xml \
sso-auth-session-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml \
sso-identity-gen-doc-com.google.code.AccountsSSO.SingleSignOn.Identity.xml
libgsignon_glib_la_SOURCES = \
signon-auth-service.h \
......@@ -83,25 +83,25 @@ libgsignon_glib_headers_with_enums = \
# default is /usr/share/dbus-1/interfaces
INTERFACES_DIR = $(top_srcdir)/libgsignon-glib/interfaces
sso-auth-service-gen.h sso-auth-service-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml
sso-auth-service-gen.h sso-auth-service-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
$(AM_V_GEN)gdbus-codegen \
--generate-c-code sso-auth-service-gen \
--generate-docbook sso-auth-service-gen-doc \
--annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \
--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \
$<
sso-auth-session-gen.h sso-auth-session-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml
sso-auth-session-gen.h sso-auth-session-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
$(AM_V_GEN)gdbus-codegen \
--generate-c-code sso-auth-session-gen \
--generate-docbook sso-auth-session-gen-doc \
--annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \
--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \
$<
sso-identity-gen.h sso-identity-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml
sso-identity-gen.h sso-identity-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
$(AM_V_GEN)gdbus-codegen \
--generate-c-code sso-identity-gen \
--generate-docbook sso-identity-gen-doc \
--annotate "com.google.code.AccountsSSO.gSingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \
--annotate "com.google.code.AccountsSSO.SingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \
$<
signon-marshal.h: signon-marshal.list Makefile
......@@ -232,9 +232,9 @@ endif
dbusinterfacesdir = $(DBUS_INTERFACES_DIR)
dbusinterfaces_DATA = \
$(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml\
$(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml\
$(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml
$(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml\
$(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml\
$(INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
EXTRA_DIST += interfaces
<!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.google.code.AccountsSSO.gSingleSignOn.AuthService">
<interface name="com.google.code.AccountsSSO.SingleSignOn.AuthService">
<method name="registerNewIdentity">
<arg name="applicationContext" type="s" direction="in"/>
<arg name="objectPath" type="o" direction="out"/>
......
<!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.google.code.AccountsSSO.gSingleSignOn.AuthSession">
<interface name="com.google.code.AccountsSSO.SingleSignOn.AuthSession">
<signal name="stateChanged">
<arg name="state" type="i" direction="out"/>
<arg name="message" type="s" direction="out"/>
......
<!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.google.code.AccountsSSO.gSingleSignOn.Identity">
<interface name="com.google.code.AccountsSSO.SingleSignOn.Identity">
<signal name="unregistered">
</signal>
<signal name="infoUpdated">
......
......@@ -43,10 +43,10 @@
/*
* Common DBUS definitions
* */
#define SIGNOND_SERVICE_PREFIX "com.google.code.AccountsSSO.gSingleSignOn"
#define SIGNOND_SERVICE_PREFIX "com.google.code.AccountsSSO.SingleSignOn"
#define SIGNOND_SERVICE SIGNOND_SERVICE_PREFIX
#define SIGNOND_DAEMON_OBJECTPATH "/com/google/code/AccountsSSO/gSingleSignOn"
#define SIGNOND_DAEMON_OBJECTPATH "/com/google/code/AccountsSSO/SingleSignOn"
#define SIGNOND_DAEMON_INTERFACE SIGNOND_SERVICE_PREFIX ".AuthService"
#define SIGNOND_IDENTITY_INTERFACE SIGNOND_SERVICE_PREFIX ".Identity"
#define SIGNOND_AUTH_SESSION_INTERFACE SIGNOND_SERVICE_PREFIX ".AuthSession"
......
......@@ -19,7 +19,7 @@ TEST_APP="$TESTDIR/signon-glib-test-wrapper.sh"
if command -v dbus-test-runner > /dev/null ; then
echo "Using dbus-test-runner"
dbus-test-runner -m 180 -t gsignond \
-t "$TEST_APP" -f com.google.code.AccountsSSO.gSingleSignOn
-t "$TEST_APP" -f com.google.code.AccountsSSO.SingleSignOn
else
echo "Using existing D-Bus session"
pkill gsignond || true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment