[network-manager-applet/cert-paths: 4/4] Merge commit 'origin/master' into cert-paths

[Dan Williams <dcbw src gnome org>]

commit 8bf378d23d18f009f4961c45796948cffb6b4774
Merge: 1a5eaae... 55ee946...
Author: Dan Williams <dcbw redhat com>
Date:   Sat Sep 19 11:31:20 2009 -0700

    Merge commit 'origin/master' into cert-paths
    
    Conflicts:
    	src/connection-editor/nm-connection-list.c

 po/ro.po                                     | 1647 ++++++++++++++++++--------
 src/applet-device-bt.c                       |    7 +-
 src/applet-device-cdma.c                     |   59 +-
 src/applet-device-gsm.c                      |   59 +-
 src/applet-device-wifi.c                     |   32 +-
 src/applet-device-wired.c                    |   14 +-
 src/applet.c                                 |   94 ++-
 src/applet.h                                 |    8 +-
 src/connection-editor/nm-connection-editor.c |   29 +-
 src/connection-editor/nm-connection-editor.h |    2 +
 src/connection-editor/nm-connection-list.c   |   25 +-
 11 files changed, 1340 insertions(+), 636 deletions(-)
---
diff --cc src/connection-editor/nm-connection-list.c
index ba2ff4b,4730784..ad8b212
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@@ -711,8 -735,12 +726,8 @@@ edit_done_cb (NMConnectionEditor *edito
  
  	switch (response) {
  	case GTK_RESPONSE_OK:
- 		/* Make sure the connection is valid */
- 		if (nm_connection_verify (connection, &edit_error)) {
+ 		/* Verify and commit user changes */
 -		utils_fill_connection_certs (connection);
 -		success = nm_connection_editor_update_connection (editor, &edit_error);
 -		utils_clear_filled_connection_certs (connection);
 -
 -		if (success) {
++		if (nm_connection_editor_update_connection (editor, &edit_error)) {
  			/* Save the connection to backing storage */
  			update_connection (info->list,
  			                   editor,