summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-11-06 13:24:06 +0100
committerThomas Haller <thaller@redhat.com>2017-11-06 13:54:23 +0100
commit8ea3d99f0c36e7bd3eb9506df7ac9eadc27af998 (patch)
tree7827e6aa5fd025646b6e88ffc4aa261335773c62
parent77a5046b2869c95435bded39dbecc618fb07ef8f (diff)
downloadnetwork-manager-applet-jk/rh1501664-edit-addr-gen-mode.tar.gz
fixup! editor: allow setting IPv6 address generation mode (rh #1501664)jk/rh1501664-edit-addr-gen-mode
The comment doesn't explain anything, that is not already obvious from the naming of things.
-rw-r--r--src/connection-editor/page-ip6.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 2bc5927f..5b60f9b7 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -75,7 +75,6 @@ typedef struct {
GtkWidget *ip6_privacy_label;
GtkComboBox *ip6_privacy_combo;
- /* IPv6 SLAAC address generation mode combo */
GtkWidget *ip6_addr_gen_mode_label;
GtkComboBox *ip6_addr_gen_mode_combo;
@@ -494,7 +493,6 @@ populate_ui (CEPageIP6 *self)
}
gtk_combo_box_set_active (priv->ip6_privacy_combo, ip6_privacy_idx);
- /* IPv6 address generation mode */
ip6_addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode (NM_SETTING_IP6_CONFIG (setting));
if (ip6_addr_gen_mode == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64)
ip6_addr_gen_mode_idx = IP6_ADDR_GEN_MODE_EUI64;
@@ -1398,7 +1396,6 @@ ui_to_setting (CEPageIP6 *self, GError **error)
break;
}
- /* IPv6 address generation mode */
if (gtk_combo_box_get_active (priv->ip6_addr_gen_mode_combo) == IP6_ADDR_GEN_MODE_EUI64)
ip6_addr_gen_mode = NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64;
else