[network-manager-applet] applet: do not shadow dup() symbol



commit b42101a1de6ee73f482e6f17b3178c84cdff6dbb
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Mon Mar 19 15:09:24 2012 +0100

    applet: do not shadow dup() symbol

 src/applet-agent.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 6054480..7957f26 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -190,19 +190,19 @@ get_secrets_cb (AppletAgent *self,
 		 * redundant.
 		 */
 		if (secrets && (r->flags != NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE)) {
-			NMConnection *dup;
+			NMConnection *dupl;
 			GHashTableIter iter;
 			const char *setting_name;
 
 			/* Copy the existing connection and update its secrets */
-			dup = nm_connection_duplicate (r->connection);
+			dupl = nm_connection_duplicate (r->connection);
 			g_hash_table_iter_init (&iter, secrets);
 			while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, NULL))
-				nm_connection_update_secrets (dup, setting_name, secrets, NULL);
+				nm_connection_update_secrets (dupl, setting_name, secrets, NULL);
 
 			/* And save updated secrets to the keyring */
-			nm_secret_agent_save_secrets (NM_SECRET_AGENT (self), dup, get_save_cb, NULL);
-			g_object_unref (dup);
+			nm_secret_agent_save_secrets (NM_SECRET_AGENT (self), dupl, get_save_cb, NULL);
+			g_object_unref (dupl);
 		}
 
 		r->get_callback (NM_SECRET_AGENT (r->agent), r->connection, secrets, error, r->callback_data);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]