[network-manager-applet] editor: use duplicated connection, not original
- From: Dan Williams <dcbw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-applet] editor: use duplicated connection, not original
- Date: Tue, 29 Sep 2009 01:04:01 +0000 (UTC)
commit 78b7101d570aa874cd748b0488ddeda15d7657df
Author: Dan Williams <dcbw redhat com>
Date: Mon Sep 28 18:02:57 2009 -0700
editor: use duplicated connection, not original
Otherwise the original gets modified, which isn't what we want until
the use hits the Apply button.
src/connection-editor/nm-connection-editor.c | 34 +++++++++++++-------------
1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index a60e299..06ab4d5 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -580,44 +580,44 @@ nm_connection_editor_set_connection (NMConnectionEditor *editor,
connection_type = nm_setting_connection_get_connection_type (s_con);
if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {
- if (!add_page (editor, ce_page_wired_new, connection, error))
+ if (!add_page (editor, ce_page_wired_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_wired_security_new, connection, error))
+ if (!add_page (editor, ce_page_wired_security_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip4_new, connection, error))
+ if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip6_new, connection, error))
+ if (!add_page (editor, ce_page_ip6_new, editor->connection, error))
goto out;
} else if (!strcmp (connection_type, NM_SETTING_WIRELESS_SETTING_NAME)) {
- if (!add_page (editor, ce_page_wireless_new, connection, error))
+ if (!add_page (editor, ce_page_wireless_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_wireless_security_new, connection, error))
+ if (!add_page (editor, ce_page_wireless_security_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip4_new, connection, error))
+ if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip6_new, connection, error))
+ if (!add_page (editor, ce_page_ip6_new, editor->connection, error))
goto out;
} else if (!strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME)) {
- if (!add_page (editor, ce_page_vpn_new, connection, error))
+ if (!add_page (editor, ce_page_vpn_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip4_new, connection, error))
+ if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
} else if (!strcmp (connection_type, NM_SETTING_PPPOE_SETTING_NAME)) {
- if (!add_page (editor, ce_page_dsl_new, connection, error))
+ if (!add_page (editor, ce_page_dsl_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_wired_new, connection, error))
+ if (!add_page (editor, ce_page_wired_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ppp_new, connection, error))
+ if (!add_page (editor, ce_page_ppp_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip4_new, connection, error))
+ if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
} else if (!strcmp (connection_type, NM_SETTING_GSM_SETTING_NAME) ||
!strcmp (connection_type, NM_SETTING_CDMA_SETTING_NAME)) {
- if (!add_page (editor, ce_page_mobile_new, connection, error))
+ if (!add_page (editor, ce_page_mobile_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ppp_new, connection, error))
+ if (!add_page (editor, ce_page_ppp_new, editor->connection, error))
goto out;
- if (!add_page (editor, ce_page_ip4_new, connection, error))
+ if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
} else {
g_warning ("Unhandled setting type '%s'", connection_type);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]