[gnome-keyring] Consistent use of 'Secret' vs 'Secrets' in introspection XML.

[Stefan Walter <stefw src gnome org>]

commit 00535a9a70bd38c9b019068901fbf21632dc8ef8
Author: Stef Walter <stefw collabora co uk>
Date:   Sun Mar 13 12:44:53 2011 +0100

    Consistent use of 'Secret' vs 'Secrets' in introspection XML.
    
    And in the comments.

 daemon/dbus/gkd-secret-introspect.c |   10 +++++-----
 daemon/dbus/gkd-secret-objects.c    |   12 ++++++------
 daemon/dbus/gkd-secret-prompt.c     |    4 ++--
 daemon/dbus/gkd-secret-session.c    |    2 +-
 daemon/dbus/gkd-secret-unlock.c     |    4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-introspect.c b/daemon/dbus/gkd-secret-introspect.c
index b6f9813..cb4aa31 100644
--- a/daemon/dbus/gkd-secret-introspect.c
+++ b/daemon/dbus/gkd-secret-introspect.c
@@ -53,7 +53,7 @@ const gchar *gkd_secret_introspect_collection =
 	"		</method>\n"
 	"	</interface>\n"
 	"\n"
-	"	<interface name='org.freedesktop.Secrets.Collection'>\n"
+	"	<interface name='org.freedesktop.Secret.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"
@@ -114,7 +114,7 @@ const gchar *gkd_secret_introspect_item =
 	"		</method>\n"
 	"	</interface>\n"
 	"\n"
-	"	<interface name='org.freedesktop.Secrets.Item'>\n"
+	"	<interface name='org.freedesktop.Secret.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"
@@ -146,7 +146,7 @@ const gchar *gkd_secret_introspect_prompt =
 	"		</method>\n"
 	"	</interface>\n"
 	"\n"
-	"	<interface name='org.freedesktop.Secrets.Prompt'>\n"
+	"	<interface name='org.freedesktop.Secret.Prompt'>\n"
 	"		<method name='Prompt'>\n"
 	"			<arg name='window-id' type='s' direction='in'/>\n"
 	"		</method>\n"
@@ -188,7 +188,7 @@ const gchar *gkd_secret_introspect_service =
 	"		</method>\n"
 	"	</interface>\n"
 	"\n"
-	"	<interface name='org.freedesktop.Secrets.Service'>\n"
+	"	<interface name='org.freedesktop.Secret.Service'>\n"
 	"\n"
 	"		<property name='Collections' type='ao' access='read'/>\n"
 	"\n"
@@ -267,7 +267,7 @@ const gchar *gkd_secret_introspect_session =
 	"		</method>\n"
 	"	</interface>\n"
 	"\n"
-	"	<interface name='org.freedesktop.Secrets.Session'>\n"
+	"	<interface name='org.freedesktop.Secret.Session'>\n"
 	"		<method name='Close'>\n"
 	"		</method>\n"
 	"	</interface>\n"
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index 4cfd4e7..08f4ec0 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -430,15 +430,15 @@ item_method_set_secret (GkdSecretObjects *self, GckObject *item, DBusMessage *me
 static DBusMessage*
 item_message_handler (GkdSecretObjects *self, GckObject *object, DBusMessage *message)
 {
-	/* org.freedesktop.Secrets.Item.Delete() */
+	/* org.freedesktop.Secret.Item.Delete() */
 	if (dbus_message_is_method_call (message, SECRET_ITEM_INTERFACE, "Delete"))
 		return item_method_delete (self, object, message);
 
-	/* org.freedesktop.Secrets.Session.GetSecret() */
+	/* org.freedesktop.Secret.Session.GetSecret() */
 	else if (dbus_message_is_method_call (message, SECRET_ITEM_INTERFACE, "GetSecret"))
 		return item_method_get_secret (self, object, message);
 
-	/* org.freedesktop.Secrets.Session.SetSecret() */
+	/* org.freedesktop.Secret.Session.SetSecret() */
 	else if (dbus_message_is_method_call (message, SECRET_ITEM_INTERFACE, "SetSecret"))
 		return item_method_set_secret (self, object, message);
 
@@ -781,15 +781,15 @@ collection_method_delete (GkdSecretObjects *self, GckObject *object, DBusMessage
 static DBusMessage*
 collection_message_handler (GkdSecretObjects *self, GckObject *object, DBusMessage *message)
 {
-	/* org.freedesktop.Secrets.Collection.Delete() */
+	/* org.freedesktop.Secret.Collection.Delete() */
 	if (dbus_message_is_method_call (message, SECRET_COLLECTION_INTERFACE, "Delete"))
 		return collection_method_delete (self, object, message);
 
-	/* org.freedesktop.Secrets.Collection.SearchItems() */
+	/* org.freedesktop.Secret.Collection.SearchItems() */
 	if (dbus_message_is_method_call (message, SECRET_COLLECTION_INTERFACE, "SearchItems"))
 		return collection_method_search_items (self, object, message);
 
-	/* org.freedesktop.Secrets.Collection.CreateItem() */
+	/* org.freedesktop.Secret.Collection.CreateItem() */
 	if (dbus_message_is_method_call (message, SECRET_COLLECTION_INTERFACE, "CreateItem"))
 		return collection_method_create_item (self, object, message);
 
diff --git a/daemon/dbus/gkd-secret-prompt.c b/daemon/dbus/gkd-secret-prompt.c
index 7ff6c79..9201ec5 100644
--- a/daemon/dbus/gkd-secret-prompt.c
+++ b/daemon/dbus/gkd-secret-prompt.c
@@ -275,11 +275,11 @@ gkd_secret_prompt_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *m
 	if (!caller || !g_str_equal (caller, self->pv->caller))
 		g_return_val_if_reached (NULL);
 
-	/* org.freedesktop.Secrets.Prompt.Prompt() */
+	/* org.freedesktop.Secret.Prompt.Prompt() */
 	else if (dbus_message_is_method_call (message, SECRET_PROMPT_INTERFACE, "Prompt"))
 		reply = prompt_method_prompt (self, message);
 
-	/* org.freedesktop.Secrets.Prompt.Negotiate() */
+	/* org.freedesktop.Secret.Prompt.Negotiate() */
 	else if (dbus_message_is_method_call (message, SECRET_PROMPT_INTERFACE, "Dismiss"))
 		reply = prompt_method_dismiss (self, message);
 
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index 81648b9..483c79c 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -310,7 +310,7 @@ gkd_secret_session_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *
 	if (!caller || !g_str_equal (caller, self->caller))
 		g_return_val_if_reached (NULL);
 
-	/* org.freedesktop.Secrets.Session.Close() */
+	/* org.freedesktop.Secret.Session.Close() */
 	else if (dbus_message_is_method_call (message, SECRET_SESSION_INTERFACE, "Close"))
 		return session_method_close (self, message);
 
diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
index 35f672a..40d141e 100644
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@ -314,11 +314,11 @@ gkd_secret_unlock_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *m
 	if (!caller || !g_str_equal (caller, self->caller))
 		g_return_val_if_reached (NULL);
 
-	/* org.freedesktop.Secrets.Prompt.Prompt() */
+	/* org.freedesktop.Secret.Prompt.Prompt() */
 	else if (dbus_message_is_method_call (message, SECRET_PROMPT_INTERFACE, "Prompt"))
 		reply = prompt_method_prompt (self, message);
 
-	/* org.freedesktop.Secrets.Prompt.Negotiate() */
+	/* org.freedesktop.Secret.Prompt.Negotiate() */
 	else if (dbus_message_is_method_call (message, SECRET_PROMPT_INTERFACE, "Dismiss"))
 		reply = prompt_method_dismiss (self, message);