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

[Dan Williams <dcbw src gnome org>]

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

    trivial: don't shadow basename()

 src/gnome-bluetooth/network-manager-applet.c |    9 +++------
 src/vpn-password-dialog.c                    |    8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/src/gnome-bluetooth/network-manager-applet.c b/src/gnome-bluetooth/network-manager-applet.c
index 52fff02..d78f85f 100644
--- a/src/gnome-bluetooth/network-manager-applet.c
+++ b/src/gnome-bluetooth/network-manager-applet.c
@@ -507,10 +507,10 @@ modem_get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 	/* check whether this is the device we care about */
 	value = g_hash_table_lookup (properties, "Device");
 	if (value && G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)) {
-		char *basename = g_path_get_basename (info->rfcomm_iface);
+		char *iface_basename = g_path_get_basename (info->rfcomm_iface);
 		const char *modem_iface = g_value_get_string (value);
 
-		if (!strcmp (basename, modem_iface)) {
+		if (!strcmp (iface_basename, modem_iface)) {
 			/* yay, found it! */
 
 			value = g_hash_table_lookup (properties, "Type");
@@ -529,10 +529,7 @@ modem_get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 			}
 		} else {
 			g_message ("%s: (%s) (%s) not the modem we're looking for (%s)",
-			           __func__,
-			           path,
-			           modem_iface,
-			           basename);
+			           __func__, path, modem_iface, iface_basename);
 		}
 
 		g_free (basename);
diff --git a/src/vpn-password-dialog.c b/src/vpn-password-dialog.c
index b1eae10..a4fbda7 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;