From 8f6a6b4d86d46e2cf0ad7ff6e24eee4594cb061e Mon Sep 17 00:00:00 2001
From: Amarnath Valluri <amarnath.valluri@linux.intel.com>
Date: Fri, 13 Feb 2015 10:50:02 +0200
Subject: [PATCH] FIX Issue 227: [gsignond] Dbus interface for UI

---
 configure.ac                                           | 10 ++++------
 dists/rpm/gsignond-suse.spec                           |  2 --
 dists/rpm/gsignond-tizen.spec                          |  2 --
 src/daemon/dbus/Makefile.am                            |  5 ++++-
 ...google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml | 18 ++++++++++++++++++
 .../com.google.code.AccountsSSO.gSingleSignOn.UI.xml   |  8 ++++++++
 6 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml
 create mode 100644 src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.xml

diff --git a/configure.ac b/configure.ac
index 49cfa9a..fa6e07f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,12 +95,10 @@ elif test "x$enable_dbus_type" = "xsystem" ; then
         DBUS_SERVICES_DIR="`pkg-config --variable system_bus_services_dir dbus-1`"
     fi
 fi
-if test "x$enable_dbus_type" != "xp2p" ; then
-    if test "x$enable_distcheck" = "xyes" ; then
-        DBUS_INTERFACES_DIR="${datadir}/dbus-1/interfaces"
-    else
-        DBUS_INTERFACES_DIR="`pkg-config --variable interfaces_dir dbus-1`"
-    fi
+if test "x$enable_distcheck" = "xyes" ; then
+    DBUS_INTERFACES_DIR="${datadir}/dbus-1/interfaces"
+else
+    DBUS_INTERFACES_DIR="`pkg-config --variable interfaces_dir dbus-1`"
 fi
 
 AC_ARG_ENABLE(keychain,
diff --git a/dists/rpm/gsignond-suse.spec b/dists/rpm/gsignond-suse.spec
index 7a2318b..1f2613e 100644
--- a/dists/rpm/gsignond-suse.spec
+++ b/dists/rpm/gsignond-suse.spec
@@ -104,9 +104,7 @@ groupadd -f -r gsignond
 %{_libdir}/lib%{name}-*.so
 %{_libdir}/lib%{name}-*.la
 %{_libdir}/pkgconfig/%{name}.pc
-%if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*SSO*.xml
-%endif
 
 
 %files doc
diff --git a/dists/rpm/gsignond-tizen.spec b/dists/rpm/gsignond-tizen.spec
index 06f5a33..15b92b7 100644
--- a/dists/rpm/gsignond-tizen.spec
+++ b/dists/rpm/gsignond-tizen.spec
@@ -101,9 +101,7 @@ getent group gsignond > /dev/null || /usr/sbin/groupadd -r gsignond
 %{_includedir}/%{name}/*.h
 %{_libdir}/lib%{name}-*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*SSO*.xml
-%endif
 
 
 %files doc
diff --git a/src/daemon/dbus/Makefile.am b/src/daemon/dbus/Makefile.am
index f3b67e3..32b6695 100644
--- a/src/daemon/dbus/Makefile.am
+++ b/src/daemon/dbus/Makefile.am
@@ -108,7 +108,10 @@ 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.gSingleSignOn.Identity.xml \
+    $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.UI.xml \
+    $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml \
+    $(NULL)
 
 EXTRA_DIST = interfaces
 
diff --git a/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml b/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml
new file mode 100644
index 0000000..189dce1
--- /dev/null
+++ b/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.Dialog.xml
@@ -0,0 +1,18 @@
+<!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.UI.Dialog">
+    <method name="queryDialog">
+      <arg type="a{sv}" direction="out"/>
+      <arg name="parameters" type="a{sv}" direction="in"/>
+    </method>
+    <method name="refreshDialog">
+      <arg name="parameters" type="a{sv}" direction="in"/>
+    </method>
+    <method name="cancelUiRequest">
+      <arg name="requestId" type="s" direction="in"/>
+    </method>
+    <signal name="refresh">
+      <arg name="requestId" type="s" direction="out"/>
+    </signal>
+  </interface>
+</node>
diff --git a/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.xml b/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.xml
new file mode 100644
index 0000000..f3b9282
--- /dev/null
+++ b/src/daemon/dbus/interfaces/com.google.code.AccountsSSO.gSingleSignOn.UI.xml
@@ -0,0 +1,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="com.google.code.AccountsSSO.gSingleSignOn.UI">
+    <method name="getBusAddress">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+</node>
-- 
2.7.4