diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c index bba071a12..5f343ad70 100644 --- a/panels/network/connection-editor/ce-page-8021x-security.c +++ b/panels/network/connection-editor/ce-page-8021x-security.c @@ -103,7 +103,6 @@ ce_page_8021x_security_new (NMConnection *connection, self = CE_PAGE_8021X_SECURITY (ce_page_new (ce_page_8021x_security_get_type (), connection, - client, "/org/gnome/control-center/network/8021x-security-page.ui")); self->box = GTK_BOX (gtk_builder_get_object (CE_PAGE (self)->builder, "box")); diff --git a/panels/network/connection-editor/ce-page-details.c b/panels/network/connection-editor/ce-page-details.c index ccad4189c..27f09ef30 100644 --- a/panels/network/connection-editor/ce-page-details.c +++ b/panels/network/connection-editor/ce-page-details.c @@ -423,7 +423,6 @@ ce_page_details_new (NMConnection *connection, self = CE_PAGE_DETAILS (ce_page_new (ce_page_details_get_type (), connection, - client, "/org/gnome/control-center/network/details-page.ui")); self->all_user_check = GTK_CHECK_BUTTON (gtk_builder_get_object (CE_PAGE (self)->builder, "all_user_check")); diff --git a/panels/network/connection-editor/ce-page-ethernet.c b/panels/network/connection-editor/ce-page-ethernet.c index e88c55afd..3ecacc4a2 100644 --- a/panels/network/connection-editor/ce-page-ethernet.c +++ b/panels/network/connection-editor/ce-page-ethernet.c @@ -35,14 +35,15 @@ struct _CEPageEthernet { CEPage parent; - NMSettingConnection *setting_connection; - NMSettingWired *setting_wired; - GtkEntry *name; GtkComboBoxText *device_mac; GtkComboBoxText *cloned_mac; GtkSpinButton *mtu; GtkWidget *mtu_label; + + NMClient *client; + NMSettingConnection *setting_connection; + NMSettingWired *setting_wired; }; G_DEFINE_TYPE (CEPageEthernet, ce_page_ethernet, CE_TYPE_PAGE) @@ -87,7 +88,7 @@ connect_ethernet_page (CEPageEthernet *self) gtk_entry_set_text (self->name, name); /* Device MAC address */ - mac_list = ce_page_get_mac_list (CE_PAGE (self)->client, NM_TYPE_DEVICE_ETHERNET, + mac_list = ce_page_get_mac_list (self->client, NM_TYPE_DEVICE_ETHERNET, NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS); s_mac_str = nm_setting_wired_get_mac_address (setting); ce_page_setup_mac_combo (self->device_mac, s_mac_str, mac_list); @@ -203,7 +204,6 @@ ce_page_ethernet_new (NMConnection *connection, self = CE_PAGE_ETHERNET (ce_page_new (ce_page_ethernet_get_type (), connection, - client, "/org/gnome/control-center/network/ethernet-page.ui")); self->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (self)->builder, "name_entry")); @@ -212,6 +212,7 @@ ce_page_ethernet_new (NMConnection *connection, self->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (self)->builder, "mtu_spin")); self->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (self)->builder, "mtu_label")); + self->client = client; self->setting_connection = nm_connection_get_setting_connection (connection); self->setting_wired = nm_connection_get_setting_wired (connection); diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c index 51552cb73..40b3e5013 100644 --- a/panels/network/connection-editor/ce-page-ip4.c +++ b/panels/network/connection-editor/ce-page-ip4.c @@ -899,7 +899,6 @@ ce_page_ip4_new (NMConnection *connection, self = CE_PAGE_IP4 (ce_page_new (ce_page_ip4_get_type (), connection, - client, "/org/gnome/control-center/network/ip4-page.ui")); self->setting = nm_connection_get_setting_ip4_config (connection); diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c index 4ebdbebfe..26ffab3e4 100644 --- a/panels/network/connection-editor/ce-page-ip6.c +++ b/panels/network/connection-editor/ce-page-ip6.c @@ -823,7 +823,6 @@ ce_page_ip6_new (NMConnection *connection, self = CE_PAGE_IP6 (ce_page_new (ce_page_ip6_get_type (), connection, - client, "/org/gnome/control-center/network/ip6-page.ui")); self->setting = nm_connection_get_setting_ip6_config (connection); diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c index 1cb86ef5d..679903419 100644 --- a/panels/network/connection-editor/ce-page-security.c +++ b/panels/network/connection-editor/ce-page-security.c @@ -463,7 +463,6 @@ ce_page_security_new (NMConnection *connection, self = CE_PAGE_SECURITY (ce_page_new (ce_page_security_get_type (), connection, - client, "/org/gnome/control-center/network/security-page.ui")); sws = nm_connection_get_setting_wireless_security (connection); diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c index 4da6c6b76..6a243581f 100644 --- a/panels/network/connection-editor/ce-page-vpn.c +++ b/panels/network/connection-editor/ce-page-vpn.c @@ -208,7 +208,6 @@ ce_page_vpn_new (NMConnection *connection, self = CE_PAGE_VPN (ce_page_new (ce_page_vpn_get_type (), connection, - client, "/org/gnome/control-center/network/vpn-page.ui")); self->failure_label = GTK_LABEL (gtk_builder_get_object (CE_PAGE (self)->builder, "failure_label")); diff --git a/panels/network/connection-editor/ce-page-wifi.c b/panels/network/connection-editor/ce-page-wifi.c index 36807144e..07900d791 100644 --- a/panels/network/connection-editor/ce-page-wifi.c +++ b/panels/network/connection-editor/ce-page-wifi.c @@ -40,6 +40,7 @@ struct _CEPageWifi GtkComboBoxText *mac_combo; GtkEntry *ssid_entry; + NMClient *client; NMSettingWireless *setting; }; @@ -78,7 +79,7 @@ connect_wifi_page (CEPageWifi *self) g_strfreev (bssid_list); g_signal_connect_swapped (self->bssid_combo, "changed", G_CALLBACK (ce_page_changed), self); - mac_list = ce_page_get_mac_list (CE_PAGE (self)->client, NM_TYPE_DEVICE_WIFI, + mac_list = ce_page_get_mac_list (self->client, NM_TYPE_DEVICE_WIFI, NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS); s_mac_str = nm_setting_wireless_get_mac_address (self->setting); ce_page_setup_mac_combo (self->mac_combo, s_mac_str, mac_list); @@ -189,7 +190,6 @@ ce_page_wifi_new (NMConnection *connection, self = CE_PAGE_WIFI (ce_page_new (ce_page_wifi_get_type (), connection, - client, "/org/gnome/control-center/network/wifi-page.ui")); self->bssid_combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (self)->builder, "bssid_combo")); @@ -197,6 +197,7 @@ ce_page_wifi_new (NMConnection *connection, self->mac_combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (self)->builder, "mac_combo")); self->ssid_entry = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (self)->builder, "ssid_entry")); + self->client = client; self->setting = nm_connection_get_setting_wireless (connection); connect_wifi_page (self); diff --git a/panels/network/connection-editor/ce-page.c b/panels/network/connection-editor/ce-page.c index caf150055..40be1ff53 100644 --- a/panels/network/connection-editor/ce-page.c +++ b/panels/network/connection-editor/ce-page.c @@ -200,7 +200,6 @@ ce_page_class_init (CEPageClass *page_class) CEPage * ce_page_new (GType type, NMConnection *connection, - NMClient *client, const gchar *ui_resource) { g_autoptr(CEPage) self = NULL; @@ -209,7 +208,6 @@ ce_page_new (GType type, self = CE_PAGE (g_object_new (type, "connection", connection, NULL)); - self->client = client; if (ui_resource) { if (!gtk_builder_add_from_resource (self->builder, ui_resource, &error)) { diff --git a/panels/network/connection-editor/ce-page.h b/panels/network/connection-editor/ce-page.h index adc3afcad..6628662a5 100644 --- a/panels/network/connection-editor/ce-page.h +++ b/panels/network/connection-editor/ce-page.h @@ -49,7 +49,6 @@ struct _CEPage GtkWidget *page; NMConnection *connection; - NMClient *client; }; struct _CEPageClass @@ -73,7 +72,6 @@ gboolean ce_page_get_initialized (CEPage *page); void ce_page_changed (CEPage *page); CEPage *ce_page_new (GType type, NMConnection *connection, - NMClient *client, const gchar *ui_resource); void ce_page_complete_init (CEPage *page, const gchar *setting_name,