[network-manager-applet] editor: fix local VPN password requests

[Dan Williams <dcbw src gnome org>]

commit fe7ae79e6555a43a63194e08b57d62a19357742b
Author: Dan Williams <dcbw redhat com>
Date:   Wed Aug 26 16:06:41 2009 -0500

    editor: fix local VPN password requests
    
    The connection editor gets saved passwords (if there are any) out of
    the keyring directly.  Since the same NMAGConfConnection code is getting
    run now for both D-Bus and local secrets requests, we need to handle
    that case.

 src/gconf-helpers/nma-gconf-connection.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/gconf-helpers/nma-gconf-connection.c b/src/gconf-helpers/nma-gconf-connection.c
index bf4a780..f95dda9 100644
--- a/src/gconf-helpers/nma-gconf-connection.c
+++ b/src/gconf-helpers/nma-gconf-connection.c
@@ -318,8 +318,10 @@ internal_get_secrets (NMSettingsConnectionInterface *connection,
 		return FALSE;
 	}
 
-	/* VPN passwords are handled by the VPN plugin's auth dialog */
-	if (!strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME))
+	/* VPN passwords are handled by the VPN plugin's auth dialog when the
+	 * request comes from D-Bus.
+	 */
+	if (!local && !strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME))
 		goto get_secrets;
 
 	if (request_new) {