From 86ffea8004980b9ab931d3f172e89fe192af6cd0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 24 Aug 2014 16:16:30 +0200 Subject: [PATCH] libnm: ensure auto-registration only when not yet registered Calling nm_secret_agent_register() on an already registered instance leads to a warning. Ensure to call register during auto-registration only when needed. https://bugzilla.gnome.org/show_bug.cgi?id=727923 Signed-off-by: Thomas Haller --- libnm-glib/nm-secret-agent.c | 3 ++- libnm/nm-secret-agent.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index ea6197743c..9627d7311d 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -702,7 +702,8 @@ auto_register_cb (gpointer user_data) NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self); priv->auto_register_id = 0; - if (priv->auto_register && !priv->suppress_auto && (priv->reg_call == NULL)) + if (priv->auto_register && !priv->suppress_auto && + (priv->reg_call == NULL && !priv->registered)) nm_secret_agent_register (self); return FALSE; } diff --git a/libnm/nm-secret-agent.c b/libnm/nm-secret-agent.c index 384c5e69e6..ee8b25bef1 100644 --- a/libnm/nm-secret-agent.c +++ b/libnm/nm-secret-agent.c @@ -703,7 +703,8 @@ auto_register_cb (gpointer user_data) NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self); priv->auto_register_id = 0; - if (priv->auto_register && !priv->suppress_auto && (priv->reg_call == NULL)) + if (priv->auto_register && !priv->suppress_auto && + (priv->reg_call == NULL && !priv->registered)) nm_secret_agent_register (self); return FALSE; }