[gnome-keyring/dbus-api] Cleanup the session implementation, remove unused code.
- From: Stefan Walter <stefw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-keyring/dbus-api] Cleanup the session implementation, remove unused code.
- Date: Mon, 14 Dec 2009 01:57:24 +0000 (UTC)
commit 4fb2cfdc780f611429610eecda71d52a6cdaedb3
Author: Stef Walter <stef memberwebs com>
Date: Sat Dec 12 00:20:38 2009 +0000
Cleanup the session implementation, remove unused code.
Also update the introspection xml.
daemon/data/introspect-session.xml | 18 ------------------
daemon/dbus/gkd-secret-session.c | 32 ++------------------------------
2 files changed, 2 insertions(+), 48 deletions(-)
---
diff --git a/daemon/data/introspect-session.xml b/daemon/data/introspect-session.xml
index 5235947..c85c48b 100644
--- a/daemon/data/introspect-session.xml
+++ b/daemon/data/introspect-session.xml
@@ -11,24 +11,6 @@
<interface name="org.freedesktop.Secrets.Session">
<method name="Close">
</method>
- <method name="Negotiate">
- <arg name="algorithm" type="s" direction="in"/>
- <arg name="input" type="v" direction="in"/>
- <arg name="output" type="v" direction="out"/>
- <arg name="complete" type="b" direction="out"/>
- </method>
- <method name="GetSecret">
- <arg name="item" type="o" direction="in"/>
- <arg name="secret" type="(oayay)" direction="out"/>
- </method>
- <method name="SetSecret">
- <arg name="item" type="o" direction="in"/>
- <arg name="secret" type="(oayay)" direction="in"/>
- </method>
- <method name="GetSecrets">
- <arg name="items" type="ao" direction="in"/>
- <arg name="secrets" type="a{o(oayay)}" direction="out"/>
- </method>
</interface>
</node>
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index 5e5435d..2a1c528 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -399,29 +399,6 @@ session_method_close (GkdSecretSession *self, DBusMessage *message)
return reply;
}
-static DBusMessage*
-session_property_handler (GkdSecretSession *self, DBusMessage *message)
-{
- g_return_val_if_reached (NULL); /* TODO: Need to implement */
-#if 0
- /* org.freedesktop.DBus.Properties.Get */
- if (dbus_message_is_method_call (message, PROPERTIES_INTERFACE, "Get") &&
- dbus_message_has_signature (message, "ss")) {
- xxx;
-
- /* org.freedesktop.DBus.Properties.Set */
- } else if (dbus_message_is_method_call (message, PROPERTIES_INTERFACE, "Set") &&
- dbus_message_has_signature (message, "ssv")) {
- xxx;
-
- /* org.freedesktop.DBus.Properties.GetAll */
- } else if (dbus_message_is_method_call (message, PROPERTIES_INTERFACE, "GetAll") &&
- dbus_message_has_signature (message, "s")) {
- xxx;
- }
-#endif
-}
-
/* -----------------------------------------------------------------------------
* OBJECT
*/
@@ -572,7 +549,6 @@ gkd_secret_session_class_init (GkdSecretSessionClass *klass)
DBusMessage*
gkd_secret_session_dispatch (GkdSecretSession *self, DBusMessage *message)
{
- DBusMessage *reply = NULL;
const gchar *caller;
g_return_val_if_fail (message, NULL);
@@ -583,18 +559,14 @@ gkd_secret_session_dispatch (GkdSecretSession *self, DBusMessage *message)
if (!caller || !g_str_equal (caller, self->caller))
g_return_val_if_reached (NULL);
- /* Check if it's properties, and hand off to property handler. */
- if (dbus_message_has_interface (message, PROPERTIES_INTERFACE))
- reply = session_property_handler (self, message);
-
/* org.freedesktop.Secrets.Session.Close() */
else if (dbus_message_is_method_call (message, SECRET_SESSION_INTERFACE, "Close"))
- reply = session_method_close (self, message);
+ return session_method_close (self, message);
else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
return gkd_dbus_introspect_handle (message, "session");
- return reply;
+ return NULL;
}
DBusMessage*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]