summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2014-09-06 19:26:00 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2015-05-20 17:21:13 +0200
commit0ee328329a3700debb39551fb5b6144e32862926 (patch)
tree35fcfb5957e5ccc57d96af5bba88753145701fb8
parent73c77f6afb1bf35ec8e4f2d898ecfa42d40522e0 (diff)
gpg: Move local variables to inner block
-rw-r--r--daemon/gpg-agent/gkd-gpg-agent-ops.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
index 2eae16c4..cf38d9a1 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
@@ -172,15 +172,9 @@ static gchar*
do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
const gchar *prompt_text, const gchar *description, gboolean confirm)
{
- GSettings *settings;
gchar *password = NULL;
GcrPrompt *prompt;
- gboolean chosen;
GError *error = NULL;
- gint lifetime;
- gchar *method;
- gchar *label;
- gchar *text;
g_assert (GCK_IS_SESSION (session));
@@ -202,6 +196,13 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
}
if (password != NULL && keyid != NULL) {
+ GSettings *settings;
+ gboolean chosen;
+ gint lifetime;
+ gchar *method;
+ gchar *label;
+ gchar *text;
+
settings = gkd_gpg_agent_settings ();
/* Load up the save options */