diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2012-09-08 20:24:48 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-09-08 21:09:03 -0400 |
| commit | 34315b2b8331cb80783524cefcfbd065eb6594ab (patch) | |
| tree | 002002d3e50f37e7b32c2194952079ffb8609cca | |
| parent | 70ddfc1c0a02cd42b71ba0a05967ae2b5f3d70c7 (diff) | |
| download | gnome-control-center-34315b2b8331cb80783524cefcfbd065eb6594ab.tar.gz | |
network: Don't show subnet for wired either
We don't show it for wifi details, and it is causing ugly warnings
from the setting code.
At the same time, make all selectable labels on the wired page
focusable as well, to be consistent with wifi.
| -rw-r--r-- | panels/network/network-wired.ui | 51 | ||||
| -rw-r--r-- | panels/network/panel-common.c | 7 |
2 files changed, 9 insertions, 49 deletions
diff --git a/panels/network/network-wired.ui b/panels/network/network-wired.ui index ab211a9d2..81c476532 100644 --- a/panels/network/network-wired.ui +++ b/panels/network/network-wired.ui @@ -135,24 +135,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="heading_subnet"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Subnet Mask</property> - <property name="mnemonic_widget">label_subnet</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> <object class="GtkLabel" id="heading_route"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -165,7 +147,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="top_attach">5</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -184,7 +166,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="top_attach">6</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -192,7 +174,7 @@ <child> <object class="GtkLabel" id="label_mac"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="label">AA:BB:CC:DD:55:66:77:88</property> <property name="selectable">True</property> @@ -207,7 +189,7 @@ <child> <object class="GtkLabel" id="label_ipv4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="label">127.0.0.1</property> <property name="selectable">True</property> @@ -222,7 +204,7 @@ <child> <object class="GtkLabel" id="label_ipv6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="label">::1</property> <property name="selectable">True</property> @@ -235,31 +217,16 @@ </packing> </child> <child> - <object class="GtkLabel" id="label_subnet"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">127.0.0.1</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">2</property> - <property name="height">1</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label_route"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="label">127.0.0.1</property> <property name="selectable">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="top_attach">5</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -267,7 +234,7 @@ <child> <object class="GtkLabel" id="label_dns"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label">127.0.0.1</property> @@ -276,7 +243,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="top_attach">6</property> <property name="width">2</property> <property name="height">1</property> </packing> diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c index c5cfdf9dd..a182b74ee 100644 --- a/panels/network/panel-common.c +++ b/panels/network/panel-common.c @@ -649,12 +649,6 @@ panel_set_device_widgets (GtkBuilder *builder, NMDevice *device) str_tmp); g_free (str_tmp); - /* IPv4 netmask */ - str_tmp = get_ipv4_config_address_as_string (ip4_config, "netmask"); - panel_set_device_widget_details (builder, - "subnet", - str_tmp); - g_free (str_tmp); } else { /* IPv4 address */ panel_set_device_widget_details (builder, @@ -707,5 +701,4 @@ panel_unset_device_widgets (GtkBuilder *builder) panel_set_device_widget_details (builder, "ipv6", NULL); panel_set_device_widget_details (builder, "dns", NULL); panel_set_device_widget_details (builder, "route", NULL); - panel_set_device_widget_details (builder, "subnet", NULL); } |