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

[dcbw svn gnome org]

Author: dcbw
Date: Sat Apr  4 15:30:00 2009
New Revision: 1251
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1251&view=rev

Log:
2009-04-04  Dan Williams  <dcbw redhat com>

	* src/connection-editor/nm-connection-editor.c
	  src/connection-editor/nm-connection-editor.h
		- (connection_editor_validate, system_checkbutton_toggled_cb,
		   recheck_initialization): don't validate before the editor is
			all initialized; fixes issues with connection values getting
			cleared becuase validation updates the connection's settings
			too, and the UI might not be completely filled in yet until
			all pages are initialized



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

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	Sat Apr  4 15:30:00 2009
@@ -146,6 +146,9 @@
 	gboolean valid = FALSE;
 	GSList *iter;
 
+	if (!editor->initialized)
+		goto done;
+
 	if (!ui_to_setting (editor))
 		goto done;
 
@@ -197,7 +200,8 @@
 	if (nm_setting_connection_get_read_only (s_con))
 		gtk_widget_set_sensitive (editor->ok_button, FALSE);
 
-	connection_editor_validate (editor);
+	if (editor->initialized)
+		connection_editor_validate (editor);
 }
 
 static void
@@ -504,6 +508,8 @@
 	populate_connection_ui (editor);
 	update_sensitivity (editor, POLKIT_RESULT_UNKNOWN);
 
+	editor->initialized = TRUE;
+
 	/* Validate the connection from an idle handler to ensure that stuff like
 	 * GtkFileChoosers have had a chance to asynchronously find their files.
 	 */

Modified: trunk/src/connection-editor/nm-connection-editor.h
==============================================================================
--- trunk/src/connection-editor/nm-connection-editor.h	(original)
+++ trunk/src/connection-editor/nm-connection-editor.h	Sat Apr  4 15:30:00 2009
@@ -43,6 +43,7 @@
 
 	/* private data */
 	NMConnection *connection;
+	gboolean initialized;
 
 	NMConnectionScope orig_scope;
 	PolKitAction *system_action;