[gnome-keyring: 2/2] Merge branch 'introspect-nodes'

[Stefan Walter <stefw src gnome org>]

commit b2231e0b7a27764d84d6008a167ca866a0d7a36e
Merge: f575afb e337f08
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Sep 26 15:40:34 2011 +0200

    Merge branch 'introspect-nodes'

 daemon/dbus/gkd-dbus-util.c         |   65 ++++++++-
 daemon/dbus/gkd-dbus-util.h         |    4 +-
 daemon/dbus/gkd-secret-introspect.c |    9 +
 daemon/dbus/gkd-secret-introspect.h |    1 +
 daemon/dbus/gkd-secret-objects.c    |  291 ++++++++++++++++++++++-------------
 daemon/dbus/gkd-secret-objects.h    |   16 ++
 daemon/dbus/gkd-secret-prompt.c     |    3 +-
 daemon/dbus/gkd-secret-service.c    |   72 +++++++++-
 daemon/dbus/gkd-secret-session.c    |    3 +-
 daemon/dbus/gkd-secret-unlock.c     |    3 +-
 10 files changed, 356 insertions(+), 111 deletions(-)
---