[network-manager-applet/NETWORKMANAGER_APPLET_0_7] trivial: don't shadow basename()



commit 4ca261e692bf729844b03136e0b4dc63b1a917ab
Author: Dan Williams <dcbw redhat com>
Date:   Thu Apr 29 21:28:37 2010 -0700

    trivial: don't shadow basename()

 src/vpn-password-dialog.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/vpn-password-dialog.c b/src/vpn-password-dialog.c
index c1d2307..76bc2d2 100644
--- a/src/vpn-password-dialog.c
+++ b/src/vpn-password-dialog.c
@@ -142,15 +142,15 @@ out:
 		gtk_window_present (GTK_WINDOW (dialog));
 		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
 	} else {
-		char *basename;
+		char *prog_basename;
 
 		/* Remove any path component, then reconstruct path to the auth
 		 * dialog in LIBEXECDIR.
 		 */
-		basename = g_path_get_basename (prog);
+		prog_basename = g_path_get_basename (prog);
 		g_free (prog);
-		prog = g_strdup_printf ("%s/%s", LIBEXECDIR, basename);
-		g_free (basename);
+		prog = g_strdup_printf ("%s/%s", LIBEXECDIR, prog_basename);
+		g_free (prog_basename);
 	}
 
 	return prog;



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