[gnome-control-center/wip/networking2: 14/36] network: move security tab to second position
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/networking2: 14/36] network: move security tab to second position
- Date: Mon, 7 Jan 2013 05:15:23 +0000 (UTC)
commit edbd6a2b6299035e8ae54a2ecdc471d03c7989a6
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 6 12:36:00 2013 -0500
network: move security tab to second position
This is based on review feedback.
.../connection-editor/net-connection-editor.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index b4b5034..3c0f22b 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -430,6 +430,12 @@ net_connection_editor_set_connection (NetConnectionEditor *editor,
type = nm_setting_connection_get_connection_type (sc);
add_page (editor, ce_page_details_new (editor->connection, editor->client, editor->settings, editor->device, editor->ap));
+
+ if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0)
+ add_page (editor, ce_page_security_new (editor->connection, editor->client, editor->settings));
+ else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0)
+ add_page (editor, ce_page_8021x_security_new (editor->connection, editor->client, editor->settings));
+
if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0)
add_page (editor, ce_page_wifi_new (editor->connection, editor->client, editor->settings));
else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0)
@@ -438,11 +444,6 @@ net_connection_editor_set_connection (NetConnectionEditor *editor,
add_page (editor, ce_page_ip4_new (editor->connection, editor->client, editor->settings));
add_page (editor, ce_page_ip6_new (editor->connection, editor->client, editor->settings));
- if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0)
- add_page (editor, ce_page_security_new (editor->connection, editor->client, editor->settings));
- else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0)
- add_page (editor, ce_page_8021x_security_new (editor->connection, editor->client, editor->settings));
-
add_page (editor, ce_page_reset_new (editor->connection, editor->client, editor->settings, editor));
pages = g_slist_copy (editor->initializing_pages);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]