GNOME.org
 

[gnome-keyring] [dbus] Include introspect files as C strings.

commit 3547f09db3da07d300a114d1d59809d8d960a0a5
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Feb 28 18:06:38 2011 +0100

    [dbus] Include introspect files as C strings.
    
    Don't distribute files, partially because it's more fragile and
    partially because they were causing this complaint:
    
    https://bugzilla.gnome.org/show_bug.cgi?id=637579

 configure.in                          |    1 -
 daemon/Makefile.am                    |    3 +-
 daemon/data/.gitignore                |    1 -
 daemon/data/Makefile.am               |   12 --
 daemon/data/introspect-collection.xml |   59 -------
 daemon/data/introspect-item.xml       |   47 ------
 daemon/data/introspect-prompt.xml     |   23 ---
 daemon/data/introspect-service.xml    |   93 -----------
 daemon/data/introspect-session.xml    |   16 --
 daemon/dbus/Makefile.am               |    2 +-
 daemon/dbus/gkd-dbus-util.c           |   19 +--
 daemon/dbus/gkd-dbus-util.h           |    2 +-
 daemon/dbus/gkd-secret-introspect.c   |  274 +++++++++++++++++++++++++++++++++
 daemon/dbus/gkd-secret-introspect.h   |   35 ++++
 daemon/dbus/gkd-secret-objects.c      |    5 +-
 daemon/dbus/gkd-secret-prompt.c       |    3 +-
 daemon/dbus/gkd-secret-service.c      |    3 +-
 daemon/dbus/gkd-secret-session.c      |    3 +-
 daemon/dbus/gkd-secret-unlock.c       |    3 +-
 19 files changed, 325 insertions(+), 279 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2d20ac0..a417431 100644
--- a/configure.in
+++ b/configure.in
@@ -691,7 +691,6 @@ daemon/org.gnome.keyring.service
 daemon/org.freedesktop.secrets.service
 daemon/control/Makefile
 daemon/control/tests/Makefile
-daemon/data/Makefile
 daemon/dbus/Makefile
 daemon/dbus/tests/Makefile
 daemon/gpg-agent/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a7bfe4d..a6db20f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = \
 	control \
 	ssh-agent \
 	gpg-agent \
-	dbus \
-	data
+	dbus
 
 bin_PROGRAMS= \
 	gnome-keyring-daemon
diff --git a/daemon/dbus/Makefile.am b/daemon/dbus/Makefile.am
index 377d536..04b2783 100644
--- a/daemon/dbus/Makefile.am
+++ b/daemon/dbus/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemon \
 	-I$(top_builddir) \
-	-DINTROSPECTDIR=\"$(datadir)/gnome-keyring/introspect\" \
 	$(DAEMON_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -22,6 +21,7 @@ libgkd_dbus_la_SOURCES = \
 	gkd-secret-create.c gkd-secret-create.h \
 	gkd-secret-dispatch.c gkd-secret-dispatch.h \
 	gkd-secret-error.c gkd-secret-error.h \
+	gkd-secret-introspect.c gkd-secret-introspect.h \
 	gkd-secret-lock.c gkd-secret-lock.h \
 	gkd-secret-objects.c gkd-secret-objects.h \
 	gkd-secret-property.c gkd-secret-property.h \
diff --git a/daemon/dbus/gkd-dbus-util.c b/daemon/dbus/gkd-dbus-util.c
index 33b303b..4596ea5 100644
--- a/daemon/dbus/gkd-dbus-util.c
+++ b/daemon/dbus/gkd-dbus-util.c
@@ -54,34 +54,19 @@ gkd_dbus_interface_match (const gchar *interface, const gchar *match)
 }
 
 DBusMessage*
-gkd_dbus_introspect_handle (DBusMessage *message, const gchar *type)
+gkd_dbus_introspect_handle (DBusMessage *message, const gchar *data)
 {
-	GError *error = NULL;
 	DBusMessage *reply;
-	gchar *filename;
-	gchar *data;
 
 	g_return_val_if_fail (message, NULL);
-	g_return_val_if_fail (type, NULL);
+	g_return_val_if_fail (data, NULL);
 
 	if (dbus_message_is_method_call (message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect") &&
 	    dbus_message_get_args (message, NULL, DBUS_TYPE_INVALID)) {
 
-		filename = g_strconcat (INTROSPECTDIR, G_DIR_SEPARATOR_S, "introspect-", type, ".xml", NULL);
-		g_file_get_contents (filename, &data, NULL, &error);
-		g_free (filename);
-
-		if (error != NULL) {
-			g_warning ("couldn't load introspect data file: %s: %s",
-			           filename, egg_error_message (error));
-			g_clear_error (&error);
-			return NULL;
-		}
-
 		reply = dbus_message_new_method_return (message);
 		if (!dbus_message_append_args (reply, DBUS_TYPE_STRING, &data, DBUS_TYPE_INVALID))
 			g_return_val_if_reached (NULL);
-		g_free (data);
 		return reply;
 	}
 
diff --git a/daemon/dbus/gkd-dbus-util.h b/daemon/dbus/gkd-dbus-util.h
index 0bc0702..44478db 100644
--- a/daemon/dbus/gkd-dbus-util.h
+++ b/daemon/dbus/gkd-dbus-util.h
@@ -34,6 +34,6 @@ GType         gkd_dbus_connection_get_boxed_type          (void) G_GNUC_CONST;
 
 gboolean      gkd_dbus_interface_match                    (const gchar *interface, const gchar *match);
 
-DBusMessage*  gkd_dbus_introspect_handle                  (DBusMessage *message, const gchar *type);
+DBusMessage*  gkd_dbus_introspect_handle                  (DBusMessage *message, const gchar *data);
 
 #endif /* GKD_DBUS_H */
diff --git a/daemon/dbus/gkd-secret-introspect.c b/daemon/dbus/gkd-secret-introspect.c
new file mode 100644
index 0000000..db9da55
--- /dev/null
+++ b/daemon/dbus/gkd-secret-introspect.c
@@ -0,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='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"
+	"		</method>\n"
+	"		<method name='SetSecret'>\n"
+	"			<arg name='secret' type='(oayay)' 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"
+	"		</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";
diff --git a/daemon/dbus/gkd-secret-introspect.h b/daemon/dbus/gkd-secret-introspect.h
new file mode 100644
index 0000000..6a3fcf7
--- /dev/null
+++ b/daemon/dbus/gkd-secret-introspect.h
@@ -0,0 +1,35 @@
+/*
+ * 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>
+ */
+
+#ifndef __GKD_SECRET_INTROSPECT_H__
+#define __GKD_SECRET_INTROSPECT_H__
+
+#include <glib.h>
+
+extern const gchar *gkd_secret_introspect_collection;
+extern const gchar *gkd_secret_introspect_item;
+extern const gchar *gkd_secret_introspect_prompt;
+extern const gchar *gkd_secret_introspect_service;
+extern const gchar *gkd_secret_introspect_session;
+
+#endif /* __GKD_SECRET_INTROSPECT_H__ */
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index a39e3e4..6a5b8aa 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -24,6 +24,7 @@
 #include "gkd-dbus-util.h"
 
 #include "gkd-secret-error.h"
+#include "gkd-secret-introspect.h"
 #include "gkd-secret-objects.h"
 #include "gkd-secret-property.h"
 #include "gkd-secret-secret.h"
@@ -455,7 +456,7 @@ item_message_handler (GkdSecretObjects *self, GckObject *object, DBusMessage *me
 		return item_property_getall (object, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "item");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_item);
 
 	return NULL;
 }
@@ -806,7 +807,7 @@ collection_message_handler (GkdSecretObjects *self, GckObject *object, DBusMessa
 		return collection_property_getall (self, object, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "collection");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_collection);
 
 	return NULL;
 }
diff --git a/daemon/dbus/gkd-secret-prompt.c b/daemon/dbus/gkd-secret-prompt.c
index f3cc126..1f67599 100644
--- a/daemon/dbus/gkd-secret-prompt.c
+++ b/daemon/dbus/gkd-secret-prompt.c
@@ -23,6 +23,7 @@
 
 #include "gkd-dbus-util.h"
 #include "gkd-secret-dispatch.h"
+#include "gkd-secret-introspect.h"
 #include "gkd-secret-service.h"
 #include "gkd-secret-prompt.h"
 #include "gkd-secret-objects.h"
@@ -284,7 +285,7 @@ gkd_secret_prompt_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *m
 		reply = prompt_method_dismiss (self, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "prompt");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_prompt);
 
 	return reply;
 }
diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
index bac9a5f..e9ba4e1 100644
--- a/daemon/dbus/gkd-secret-service.c
+++ b/daemon/dbus/gkd-secret-service.c
@@ -26,6 +26,7 @@
 #include "gkd-secret-create.h"
 #include "gkd-secret-dispatch.h"
 #include "gkd-secret-error.h"
+#include "gkd-secret-introspect.h"
 #include "gkd-secret-lock.h"
 #include "gkd-secret-objects.h"
 #include "gkd-secret-prompt.h"
@@ -870,7 +871,7 @@ service_message_handler (GkdSecretService *self, DBusMessage *message)
 		return service_property_getall (self, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "service");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_service);
 
 	return NULL;
 }
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index 939360e..8c99373 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "gkd-secret-dispatch.h"
+#include "gkd-secret-introspect.h"
 #include "gkd-secret-secret.h"
 #include "gkd-secret-service.h"
 #include "gkd-secret-session.h"
@@ -282,7 +283,7 @@ gkd_secret_session_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *
 		return session_method_close (self, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "session");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_session);
 
 	return NULL;
 }
diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
index 2005627..57dad3d 100644
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@ -23,6 +23,7 @@
 
 #include "gkd-dbus-util.h"
 #include "gkd-secret-dispatch.h"
+#include "gkd-secret-introspect.h"
 #include "gkd-secret-objects.h"
 #include "gkd-secret-secret.h"
 #include "gkd-secret-session.h"
@@ -326,7 +327,7 @@ gkd_secret_unlock_real_dispatch_message (GkdSecretDispatch *base, DBusMessage *m
 		reply = prompt_method_dismiss (self, message);
 
 	else if (dbus_message_has_interface (message, DBUS_INTERFACE_INTROSPECTABLE))
-		return gkd_dbus_introspect_handle (message, "prompt");
+		return gkd_dbus_introspect_handle (message, gkd_secret_introspect_prompt);
 
 	return reply;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]