Harmonises connection-editor with "changed the default value for auto-negotiate
from TRUE to FALSE." v2
See
https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=12b9d30
---
src/connection-editor/ce-page-ethernet.ui | 17 -----------------
src/connection-editor/page-ethernet.c | 14 --------------
2 files changed, 31 deletions(-)
diff --git a/src/connection-editor/ce-page-ethernet.ui
b/src/connection-editor/ce-page-ethernet.ui
index 6b20a07..a9d5769 100644
--- a/src/connection-editor/ce-page-ethernet.ui
+++ b/src/connection-editor/ce-page-ethernet.ui
@@ -129,23 +129,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="ethernet_duplex">
- <property name="label" translatable="yes">Full duple_x</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="ethernet_autonegotiate">
<property name="label" translatable="yes">Aut_onegotiate</property>
<property name="visible">True</property>
diff --git a/src/connection-editor/page-ethernet.c
b/src/connection-editor/page-ethernet.c
index 307bfa9..5cf4795 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -38,7 +38,6 @@ typedef struct {
GtkEntry *cloned_mac; /* Cloned MAC - used for MAC spoofing */
GtkComboBox *port;
GtkComboBox *speed;
- GtkToggleButton *duplex;
GtkToggleButton *autonegotiate;
GtkSpinButton *mtu;
GtkToggleButton *wol_default, *wol_ignore, *wol_phy, *wol_unicast,
*wol_multicast,
@@ -88,7 +87,6 @@ ethernet_private_init (CEPageEthernet *self)
priv->cloned_mac = GTK_ENTRY (gtk_builder_get_object (builder,
"ethernet_cloned_mac"));
priv->port = GTK_COMBO_BOX (gtk_builder_get_object (builder,
"ethernet_port"));
priv->speed = GTK_COMBO_BOX (gtk_builder_get_object (builder,
"ethernet_speed"));
- priv->duplex = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"ethernet_duplex"));
priv->autonegotiate = GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "ethernet_autonegotiate"));
priv->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
"ethernet_mtu"));
priv->wol_default = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"wol_default"));
@@ -159,7 +157,6 @@ populate_ui (CEPageEthernet *self)
CEPageEthernetPrivate *priv = CE_PAGE_ETHERNET_GET_PRIVATE (self);
NMSettingWired *setting = priv->setting;
const char *port;
- const char *duplex;
int port_idx = PORT_DEFAULT;
int speed_idx;
int mtu_def;
@@ -200,13 +197,6 @@ populate_ui (CEPageEthernet *self)
}
gtk_combo_box_set_active (priv->speed, speed_idx);
- /* Duplex */
- duplex = nm_setting_wired_get_duplex (setting);
- if (duplex && !strcmp (duplex, "half"))
- gtk_toggle_button_set_active (priv->duplex, FALSE);
- else
- gtk_toggle_button_set_active (priv->duplex, TRUE);
-
/* Autonegotiate */
gtk_toggle_button_set_active (priv->autonegotiate,
nm_setting_wired_get_auto_negotiate
(setting));
@@ -277,7 +267,6 @@ finish_setup (CEPageEthernet *self, gpointer unused, GError
*error, gpointer use
g_signal_connect (priv->port, "changed", G_CALLBACK (stuff_changed),
self);
g_signal_connect (priv->speed, "changed", G_CALLBACK (stuff_changed),
self);
- g_signal_connect (priv->duplex, "toggled", G_CALLBACK (stuff_changed),
self);
g_signal_connect (priv->autonegotiate, "toggled", G_CALLBACK
(stuff_changed), self);
g_signal_connect (priv->mtu, "value-changed", G_CALLBACK
(stuff_changed), self);
@@ -304,8 +293,6 @@ finish_setup (CEPageEthernet *self, gpointer unused, GError
*error, gpointer use
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"ethernet_speed"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"ethernet_duplex"));
- gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"ethernet_autonegotiate"));
gtk_widget_hide (widget);
}
@@ -446,7 +433,6 @@ ui_to_setting (CEPageEthernet *self)
NM_SETTING_WIRED_CLONED_MAC_ADDRESS, cloned_mac &&
*cloned_mac ? cloned_mac : NULL,
NM_SETTING_WIRED_PORT, port,
NM_SETTING_WIRED_SPEED, speed,
- NM_SETTING_WIRED_DUPLEX, gtk_toggle_button_get_active
(priv->duplex) ? "full" : "half",
NM_SETTING_WIRED_AUTO_NEGOTIATE,
gtk_toggle_button_get_active (priv->autonegotiate),
NM_SETTING_WIRED_WAKE_ON_LAN, wol,
NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, wol_passwd &&
*wol_passwd ? wol_passwd : NULL,
--
2.7.4
_______________________________________________
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list
