[gnome-keyring: 2/2] Merge branch 'secret-content-type'

From: Stefan Walter <stefw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-keyring: 2/2] Merge branch 'secret-content-type'
Date: Tue, 1 Mar 2011 09:28:56 +0000 (UTC)
commit 88f1bdf12908c7fa77cf263fd2aa6cf6bfea1b3c
Merge: 077170f 24d586d
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Mar 1 10:27:42 2011 +0100

    Merge branch 'secret-content-type'

 daemon/dbus/gkd-secret-introspect.c |    8 ++++----
 daemon/dbus/gkd-secret-objects.c    |    6 +++---
 daemon/dbus/gkd-secret-secret.c     |   20 +++++++++++++++++++-
 daemon/dbus/gkd-secret-service.c    |    6 +++---
 4 files changed, 29 insertions(+), 11 deletions(-)
---
diff --cc daemon/dbus/gkd-secret-introspect.c
index db9da55,0000000..8fee835
mode 100644,000000..100644
--- a/daemon/dbus/gkd-secret-introspect.c
+++ b/daemon/dbus/gkd-secret-introspect.c
@@@ -1,274 -1,0 +1,274 @@@
 +/*
 + * gnome-keyring
 + *
 + * Copyright (C) 2011 Collabora Ltd.
 + *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU Lesser General Public License as
 + * published by the Free Software Foundation; either version 2.1 of
 + * the License, or (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful, but
 + * WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 + * 02111-1307, USA.
 + *
 + * Author: Stef Walter <stefw collabora co uk>
 + */
 +
 +#include "config.h"
 +
 +#include "gkd-secret-introspect.h"
 +
 +const gchar *gkd_secret_introspect_collection =
 +	"<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'\n"
 +	"	'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"
 +	"<node>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Introspectable'>\n"
 +	"		<method name='Introspect'>\n"
 +	"			<arg name='data' direction='out' type='s'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Properties'>\n"
 +	"		<method name='Get'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='out' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='Set'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='in' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='GetAll'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='props' direction='out' type='a{sv}'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.Secrets.Collection'>\n"
 +	"		<property name='Items' type='ao' access='read'/>\n"
 +	"		<property name='Label' type='s' access='readwrite'/>\n"
 +	"		<property name='Locked' type='s' access='read'/>\n"
 +	"		<property name='Created' type='t' access='read'/>\n"
 +	"		<property name='Modified' type='t' access='read'/>\n"
 +	"		<method name='Delete'>\n"
 +	"			<arg name='prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"		<method name='SearchItems'>\n"
 +	"			<arg name='attributes' type='a{ss}' direction='in'/>\n"
 +	"			<arg name='results' type='ao' direction='out'/>\n"
 +	"		</method>\n"
 +	"		<method name='CreateItem'>\n"
 +	"			<arg name='props' type='a{sv}' direction='in'/>\n"
- 	"			<arg name='secret' type='(oayay)' direction='in'/>\n"
++	"			<arg name='secret' type='(oayays)' direction='in'/>\n"
 +	"			<arg name='replace' type='b' direction='in'/>\n"
 +	"			<arg name='item' type='o' direction='out'/>\n"
 +	"			<arg name='prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"		<signal name='ItemCreated'>\n"
 +	"			<arg name='item' type='o'/>\n"
 +	"		</signal>\n"
 +	"		<signal name='ItemDeleted'>\n"
 +	"			<arg name='item' type='o'/>\n"
 +	"		</signal>\n"
 +	"		<signal name='ItemChanged'>\n"
 +	"			<arg name='item' type='o'/>\n"
 +	"		</signal>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"</node>\n";
 +
 +const gchar *gkd_secret_introspect_item =
 +	"<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'\n"
 +	"	'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"
 +	"<node>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Introspectable'>\n"
 +	"		<method name='Introspect'>\n"
 +	"			<arg name='data' direction='out' type='s'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Properties'>\n"
 +	"		<method name='Get'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='out' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='Set'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='in' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='GetAll'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='props' direction='out' type='a{sv}'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.Secrets.Item'>\n"
 +	"		<property name='Locked' type='b' access='read'/>\n"
 +	"		<property name='Attributes' type='a{ss}' access='readwrite'/>\n"
 +	"		<property name='Label' type='s' access='readwrite'/>\n"
 +	"		<property name='Type' type='s' access='readwrite'/>\n"
 +	"		<property name='Created' type='t' access='read'/>\n"
 +	"		<property name='Modified' type='t' access='read'/>\n"
 +	"		<method name='Delete'>\n"
 +	"			<arg name='prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"		<method name='GetSecret'>\n"
 +	"			<arg name='session' type='o' direction='in'/>\n"
- 	"			<arg name='secret' type='(oayay)' direction='out'/>\n"
++	"			<arg name='secret' type='(oayays)' direction='out'/>\n"
 +	"		</method>\n"
 +	"		<method name='SetSecret'>\n"
- 	"			<arg name='secret' type='(oayay)' direction='in'/>\n"
++	"			<arg name='secret' type='(oayays)' direction='in'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"</node>\n";
 +
 +const gchar *gkd_secret_introspect_prompt =
 +	"<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'\n"
 +	"	'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"
 +	"<node>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Introspectable'>\n"
 +	"		<method name='Introspect'>\n"
 +	"			<arg name='data' direction='out' type='s'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.Secrets.Prompt'>\n"
 +	"		<method name='Prompt'>\n"
 +	"			<arg name='window-id' type='s' direction='in'/>\n"
 +	"		</method>\n"
 +	"		<method name='Dismiss'>\n"
 +	"		</method>\n"
 +	"		<signal name='Completed'>\n"
 +	"			<arg name='dismissed' type='b'/>\n"
 +	"			<arg name='result' type='v'/>\n"
 +	"		</signal>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"</node>\n";
 +
 +const gchar *gkd_secret_introspect_service =
 +	"<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'\n"
 +	"	'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"
 +	"<node>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Introspectable'>\n"
 +	"		<method name='Introspect'>\n"
 +	"			<arg name='data' direction='out' type='s'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Properties'>\n"
 +	"		<method name='Get'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='out' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='Set'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='propname' direction='in' type='s'/>\n"
 +	"			<arg name='value' direction='in' type='v'/>\n"
 +	"		</method>\n"
 +	"		<method name='GetAll'>\n"
 +	"			<arg name='interface' direction='in' type='s'/>\n"
 +	"			<arg name='props' direction='out' type='a{sv}'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.Secrets.Service'>\n"
 +	"\n"
 +	"		<property name='Collections' type='ao' access='read'/>\n"
 +	"\n"
 +	"		<method name='OpenSession'>\n"
 +	"			<arg name='algorithm' type='s' direction='in'/>\n"
 +	"			<arg name='input' type='v' direction='in'/>\n"
 +	"			<arg name='output' type='v' direction='out'/>\n"
 +	"			<arg name='result' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='CreateCollection'>\n"
 +	"			<arg name='props' type='a{sv}' direction='in'/>\n"
 +	"			<arg name='collection' type='o' direction='out'/>\n"
 +	"			<arg name='prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='SearchItems'>\n"
 +	"			<arg name='attributes' type='a{ss}' direction='in'/>\n"
 +	"			<arg name='unlocked' type='ao' direction='out'/>\n"
 +	"			<arg name='locked' type='ao' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='Unlock'>\n"
 +	"			<arg name='objects' type='ao' direction='in'/>\n"
 +	"			<arg name='unlocked' type='ao' direction='out'/>\n"
 +	"			<arg name='prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='Lock'>\n"
 +	"			<arg name='objects' type='ao' direction='in'/>\n"
 +	"			<arg name='locked' type='ao' direction='out'/>\n"
 +	"			<arg name='Prompt' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='GetSecrets'>\n"
 +	"			<arg name='items' type='ao' direction='in'/>\n"
 +	"			<arg name='session' type='o' direction='in'/>\n"
- 	"			<arg name='secrets' type='a{o(oayay)}' direction='out'/>\n"
++	"			<arg name='secrets' type='a{o(oayays)}' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='ReadAlias'>\n"
 +	"			<arg name='name' type='s' direction='in'/>\n"
 +	"			<arg name='collection' type='o' direction='out'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<method name='SetAlias'>\n"
 +	"			<arg name='name' type='s' direction='in'/>\n"
 +	"			<arg name='collection' type='o' direction='in'/>\n"
 +	"		</method>\n"
 +	"\n"
 +	"		<signal name='CollectionCreated'>\n"
 +	"			<arg name='collection' type='o'/>\n"
 +	"		</signal>\n"
 +	"\n"
 +	"		<signal name='CollectionDeleted'>\n"
 +	"			<arg name='collection' type='o'/>\n"
 +	"		</signal>\n"
 +	"\n"
 +	"		<signal name='CollectionChanged'>\n"
 +	"			<arg name='collection' type='o'/>\n"
 +	"		</signal>\n"
 +	"\n"
 +	"	</interface>\n"
 +	"\n"
 +	"</node>\n";
 +
 +const gchar *gkd_secret_introspect_session =
 +	"<!DOCTYPE node PUBLIC '-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'\n"
 +	"	'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>\n"
 +	"<node>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.DBus.Introspectable'>\n"
 +	"		<method name='Introspect'>\n"
 +	"			<arg name='data' direction='out' type='s'/>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"	<interface name='org.freedesktop.Secrets.Session'>\n"
 +	"		<method name='Close'>\n"
 +	"		</method>\n"
 +	"	</interface>\n"
 +	"\n"
 +	"</node>\n";
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]