[gnome-keyring/dbus-api] Emit Prompt.Completed signal properly.
- From: Stefan Walter <stefw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-keyring/dbus-api] Emit Prompt.Completed signal properly.
- Date: Sat, 7 Nov 2009 14:13:58 +0000 (UTC)
commit 04a6ef83a899ee64c7b398daab29ab122dae59c5
Author: Stef Walter <stef memberwebs com>
Date: Fri Nov 6 02:52:48 2009 +0000
Emit Prompt.Completed signal properly.
* Fix bad arguments passed to dbus.
* Send correct boolean value for dismissed.
daemon/dbus/gkd-secrets-prompt.c | 4 ++--
daemon/dbus/gkd-secrets-unlock.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/daemon/dbus/gkd-secrets-prompt.c b/daemon/dbus/gkd-secrets-prompt.c
index f745bca..c4596c8 100644
--- a/daemon/dbus/gkd-secrets-prompt.c
+++ b/daemon/dbus/gkd-secrets-prompt.c
@@ -363,7 +363,7 @@ gkd_secrets_prompt_complete (GkdSecretsPrompt *self)
g_return_if_fail (GKD_SECRETS_IS_PROMPT (self));
g_return_if_fail (!self->pv->completed);
self->pv->completed = TRUE;
- emit_completed (self, TRUE);
+ emit_completed (self, FALSE);
}
void
@@ -372,7 +372,7 @@ gkd_secrets_prompt_dismiss (GkdSecretsPrompt *self)
g_return_if_fail (GKD_SECRETS_IS_PROMPT (self));
g_return_if_fail (!self->pv->completed);
self->pv->completed = TRUE;
- emit_completed (self, FALSE);
+ emit_completed (self, TRUE);
}
GP11Object*
diff --git a/daemon/dbus/gkd-secrets-unlock.c b/daemon/dbus/gkd-secrets-unlock.c
index 92f779c..5919b87 100644
--- a/daemon/dbus/gkd-secrets-unlock.c
+++ b/daemon/dbus/gkd-secrets-unlock.c
@@ -250,14 +250,16 @@ gkd_secrets_unlock_encode_result (GkdSecretsPrompt *base, DBusMessageIter *iter)
GkdSecretsUnlock *self = GKD_SECRETS_UNLOCK (base);
DBusMessageIter variant;
DBusMessageIter array;
+ const char *value;
gint i;
dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "ao", &variant);
dbus_message_iter_open_container (&variant, DBUS_TYPE_ARRAY, "o", &array);
- for (i = 0; i < self->results->len; ++i)
- dbus_message_iter_append_basic (&array, DBUS_TYPE_OBJECT_PATH,
- g_array_index (self->results, gchar*, i));
+ for (i = 0; i < self->results->len; ++i) {
+ value = g_array_index (self->results, gchar*, i);
+ dbus_message_iter_append_basic (&array, DBUS_TYPE_OBJECT_PATH, &value);
+ }
dbus_message_iter_close_container (&variant, &array);
dbus_message_iter_close_container (iter, &variant);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]