diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-08-24 16:16:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-08-27 08:52:25 +0200 |
| commit | 86ffea8004980b9ab931d3f172e89fe192af6cd0 (patch) | |
| tree | 5cb519b1a7bb9a6fbfef94c8b1d47c362a1678d4 | |
| parent | 509ac4cae7e65411f8734448229e80f7d93730ad (diff) | |
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 <thaller@redhat.com>
| -rw-r--r-- | libnm-glib/nm-secret-agent.c | 3 | ||||
| -rw-r--r-- | 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; } |