From e183775af7509000b4bafce7c00d90378eed9dc0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 2 Mar 2013 19:36:39 -0500 Subject: [PATCH] network: Add firewall zone support for wired https://bugzilla.gnome.org/show_bug.cgi?id=694577 --- .../connection-editor/ce-page-ethernet.c | 10 ++ .../connection-editor/ethernet-page.ui | 135 +++++++++++------- 2 files changed, 91 insertions(+), 54 deletions(-) diff --git a/panels/network/connection-editor/ce-page-ethernet.c b/panels/network/connection-editor/ce-page-ethernet.c index 9d8a90a94..b4ebe173e 100644 --- a/panels/network/connection-editor/ce-page-ethernet.c +++ b/panels/network/connection-editor/ce-page-ethernet.c @@ -29,6 +29,7 @@ #include +#include "firewall-helpers.h" #include "ce-page-ethernet.h" G_DEFINE_TYPE (CEPageEthernet, ce_page_ethernet, CE_TYPE_PAGE) @@ -111,6 +112,11 @@ connect_ethernet_page (CEPageEthernet *page) nm_setting_connection_get_num_permissions (sc) == 0); g_signal_connect (widget, "toggled", G_CALLBACK (all_user_changed), page); + + widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_zone")); + firewall_ui_setup (sc, widget, CE_PAGE (page)->cancellable); + g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); + } static void @@ -139,6 +145,10 @@ ui_to_setting (CEPageEthernet *page) g_object_set (page->setting_connection, NM_SETTING_CONNECTION_ID, gtk_entry_get_text (page->name), NULL); + + entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_zone")); + firewall_ui_to_setting (page->setting_connection, entry); + } static gboolean diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui index 0ed08245a..faed57d13 100644 --- a/panels/network/connection-editor/ethernet-page.ui +++ b/panels/network/connection-editor/ethernet-page.ui @@ -115,12 +115,6 @@ True 0 1 - - - False - ● - - 1 @@ -177,42 +171,6 @@ 1 - - - Connect _automatically - True - True - False - end - True - True - 0 - True - - - 0 - 4 - 2 - 1 - - - - - Make available to other _users - True - True - False - True - 0 - True - - - 0 - 5 - 2 - 1 - - True @@ -241,18 +199,6 @@ 1 - - - - - - - - - - - - True @@ -265,6 +211,87 @@ 1 + + + Make available to other _users + True + True + False + True + 0 + True + + + 0 + 6 + 2 + 1 + + + + + Connect _automatically + True + True + False + end + True + True + 0 + True + + + 0 + 5 + 2 + 1 + + + + + + + + + + + + + + + + + + + + True + False + 1 + Firewall _Zone + True + combo_zone + + + 0 + 4 + 1 + 1 + + + + + True + False + 0 + 1 + + + 1 + 4 + 1 + 1 + +