network-manager-applet r914 - in trunk: . src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Mon Sep 29 22:04:08 2008
New Revision: 914
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=914&view=rev

Log:
2008-09-29  Dan Williams  <dcbw redhat com>

	* src/connection-editor/vpn-helpers.c
		- (import_vpn_from_file_cb): ensure scope is always valid

	* src/connection-editor/nm-connection-editor.c
		- (nm_connection_editor_set_connection): validate incoming connections
			to ensure the OK button gets the right status when the dialog is
			shown and that pages update their internal settings appropriately



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/nm-connection-editor.c
   trunk/src/connection-editor/vpn-helpers.c

Modified: trunk/src/connection-editor/nm-connection-editor.c
==============================================================================
--- trunk/src/connection-editor/nm-connection-editor.c	(original)
+++ trunk/src/connection-editor/nm-connection-editor.c	Mon Sep 29 22:04:08 2008
@@ -360,6 +360,8 @@
 
 	/* set the UI */
 	populate_connection_ui (editor);
+
+	connection_editor_validate (editor);
 }
 
 void

Modified: trunk/src/connection-editor/vpn-helpers.c
==============================================================================
--- trunk/src/connection-editor/vpn-helpers.c	(original)
+++ trunk/src/connection-editor/vpn-helpers.c	Mon Sep 29 22:04:08 2008
@@ -213,9 +213,11 @@
 	g_hash_table_foreach (plugins, try_import, (gpointer) &import_info);
 
 	connection = import_info.connection;
-	if (connection)
+	if (connection) {
+		if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_UNKNOWN)
+			nm_connection_set_scope (connection, NM_CONNECTION_SCOPE_USER);
 		info->callback (connection, info->user_data);
-	else {
+	} else {
 		GtkWidget *err_dialog;
 		char *basename = g_path_get_basename (filename);