Adding upstream version 1:3.38.4.upstream/1%3.38.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 829 insertions, 0 deletions

diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
new file mode 100644
index 0000000..6b71429
--- /dev/null
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -0,0 +1,829 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2012 Red Hat, Inc
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <glib/gi18n.h>
+#include <NetworkManager.h>
+
+#include "list-box-helper.h"
+#include "ce-page.h"
+#include "ce-page-ip6.h"
+#include "ui-helpers.h"
+
+static void ensure_empty_address_row (CEPageIP6 *self);
+static void ensure_empty_routes_row (CEPageIP6 *self);
+
+
+struct _CEPageIP6
+{
+        GtkScrolledWindow parent;
+
+        GtkBox            *address_box;
+        GtkSizeGroup      *address_sizegroup;
+        GtkSwitch         *auto_dns_switch;
+        GtkSwitch         *auto_routes_switch;
+        GtkRadioButton    *automatic_radio;
+        GtkBox            *content_box;
+        GtkRadioButton    *dhcp_radio;
+        GtkRadioButton    *disabled_radio;
+        GtkEntry          *dns_entry;
+        GtkRadioButton    *local_radio;
+        GtkRadioButton    *manual_radio;
+        GtkCheckButton    *never_default_check;
+        GtkBox            *routes_box;
+        GtkSizeGroup      *routes_metric_sizegroup;
+        GtkSizeGroup      *routes_sizegroup;
+        GtkRadioButton    *shared_radio;
+
+        NMSettingIPConfig *setting;
+
+        GtkWidget       *address_list;
+        GtkWidget       *routes_list;
+};
+
+static void ce_page_iface_init (CEPageInterface *);
+
+G_DEFINE_TYPE_WITH_CODE (CEPageIP6, ce_page_ip6, GTK_TYPE_SCROLLED_WINDOW,
+                         G_IMPLEMENT_INTERFACE (ce_page_get_type (), ce_page_iface_init))
+
+enum {
+        METHOD_COL_NAME,
+        METHOD_COL_METHOD
+};
+
+enum {
+        IP6_METHOD_AUTO,
+        IP6_METHOD_DHCP,
+        IP6_METHOD_MANUAL,
+        IP6_METHOD_LINK_LOCAL,
+        IP6_METHOD_SHARED,
+        IP6_METHOD_DISABLED
+};
+
+static void
+method_changed (CEPageIP6 *self)
+{
+        gboolean addr_enabled;
+        gboolean dns_enabled;
+        gboolean routes_enabled;
+
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->disabled_radio)) ||
+            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->shared_radio))) {
+                addr_enabled = FALSE;
+                dns_enabled = FALSE;
+                routes_enabled = FALSE;
+        } else {
+                addr_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->manual_radio));
+                dns_enabled = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->local_radio));
+                routes_enabled = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->local_radio));
+        }
+
+        gtk_widget_set_visible (GTK_WIDGET (self->address_box), addr_enabled);
+        gtk_widget_set_sensitive (GTK_WIDGET (self->dns_entry), dns_enabled);
+        gtk_widget_set_sensitive (GTK_WIDGET (self->routes_list), routes_enabled);
+        gtk_widget_set_sensitive (GTK_WIDGET (self->never_default_check), routes_enabled);
+
+        ce_page_changed (CE_PAGE (self));
+}
+
+static void
+update_row_sensitivity (CEPageIP6 *self, GtkWidget *list)
+{
+        GList *children, *l;
+        gint rows = 0, i = 0;
+
+        children = gtk_container_get_children (GTK_CONTAINER (list));
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkWidget *button;
+
+                button = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "delete-button"));
+                if (button != NULL)
+                        rows++;
+        }
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkWidget *button;
+
+                button = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "delete-button"));
+                if (button != NULL)
+                        gtk_widget_set_sensitive (button, rows > 1 && ++i < rows);
+        }
+        g_list_free (children);
+}
+
+static void
+remove_row (CEPageIP6 *self, GtkButton *button)
+{
+        GtkWidget *row;
+        GtkWidget *row_box;
+        GtkWidget *list;
+
+        row_box = gtk_widget_get_parent (GTK_WIDGET (button));
+        row = gtk_widget_get_parent (row_box);
+        list = gtk_widget_get_parent (row);
+
+        gtk_container_remove (GTK_CONTAINER (list), row);
+
+        ce_page_changed (CE_PAGE (self));
+
+        update_row_sensitivity (self, list);
+}
+
+static gboolean
+validate_row (GtkWidget *row)
+{
+        GtkWidget *box;
+        GList *children, *l;
+        gboolean valid;
+
+        valid = FALSE;
+        box = gtk_bin_get_child (GTK_BIN (row));
+        children = gtk_container_get_children (GTK_CONTAINER (box));
+
+        for (l = children; l != NULL; l = l->next) {
+                if (!GTK_IS_ENTRY (l->data))
+                        continue;
+
+                valid = valid || gtk_entry_get_text_length (l->data) > 0;
+        }
+
+        g_list_free (children);
+
+        return valid;
+}
+
+static void
+add_address_row (CEPageIP6   *self,
+                 const gchar *address,
+                 const gchar *network,
+                 const gchar *gateway)
+{
+        GtkWidget *row;
+        GtkWidget *row_box;
+        GtkWidget *widget;
+        GtkWidget *delete_button;
+        GtkWidget *image;
+
+        row = gtk_list_box_row_new ();
+
+        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "address", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), address);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "prefix", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), network);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "gateway", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : "");
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        delete_button = gtk_button_new ();
+        gtk_widget_set_sensitive (delete_button, FALSE);
+        gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
+        g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
+        image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
+        atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Address"));
+        gtk_button_set_image (GTK_BUTTON (delete_button), image);
+        gtk_container_add (GTK_CONTAINER (row_box), delete_button);
+        g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
+
+        gtk_size_group_add_widget (self->address_sizegroup, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (self->address_list), row);
+
+        update_row_sensitivity (self, self->address_list);
+}
+
+static void
+ensure_empty_address_row (CEPageIP6 *self)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (self->address_list));
+        l = children;
+
+        while (l && l->next)
+                l = l->next;
+
+        /* Add the last, stub row if needed*/
+        if (!l || validate_row (l->data))
+                add_address_row (self, "", "", "");
+
+        g_list_free (children);
+}
+
+static void
+add_address_box (CEPageIP6 *self)
+{
+        GtkWidget *list;
+        gint i;
+
+        self->address_list = list = gtk_list_box_new ();
+        gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
+        gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (self->address_box), list);
+
+        for (i = 0; i < nm_setting_ip_config_get_num_addresses (self->setting); i++) {
+                NMIPAddress *addr;
+                g_autofree gchar *netmask = NULL;
+
+                addr = nm_setting_ip_config_get_address (self->setting, i);
+                netmask = g_strdup_printf ("%u", nm_ip_address_get_prefix (addr));
+                add_address_row (self, nm_ip_address_get_address (addr), netmask,
+                                 i == 0 ? nm_setting_ip_config_get_gateway (self->setting) : NULL);
+        }
+        if (nm_setting_ip_config_get_num_addresses (self->setting) == 0)
+                ensure_empty_address_row (self);
+
+        gtk_widget_show_all (GTK_WIDGET (self->address_box));
+}
+
+static void
+add_dns_section (CEPageIP6 *self)
+{
+        GString *string;
+        gint i;
+
+        gtk_switch_set_active (self->auto_dns_switch, !nm_setting_ip_config_get_ignore_auto_dns (self->setting));
+        g_signal_connect_object (self->auto_dns_switch, "notify::active", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+
+        string = g_string_new ("");
+
+        for (i = 0; i < nm_setting_ip_config_get_num_dns (self->setting); i++) {
+                const char *address;
+
+                address = nm_setting_ip_config_get_dns (self->setting, i);
+
+                if (i > 0)
+                        g_string_append (string, ", ");
+
+                g_string_append (string, address);
+
+        }
+
+        gtk_entry_set_text (self->dns_entry, string->str);
+
+        g_signal_connect_object (self->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+
+        g_string_free (string, TRUE);
+}
+
+static void
+add_route_row (CEPageIP6   *self,
+               const gchar *address,
+               const gchar *prefix,
+               const gchar *gateway,
+               const gchar *metric)
+{
+        GtkWidget *row;
+        GtkWidget *row_box;
+        GtkWidget *widget;
+        GtkWidget *delete_button;
+        GtkWidget *image;
+
+        row = gtk_list_box_row_new ();
+
+        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "address", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), address);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "prefix", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), prefix ? prefix : "");
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "gateway", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), gateway);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        widget = gtk_entry_new ();
+        g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED);
+        g_object_set_data (G_OBJECT (row), "metric", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), metric ? metric : "");
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        gtk_size_group_add_widget (self->routes_metric_sizegroup, widget);
+
+        delete_button = gtk_button_new ();
+        gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
+        g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
+        image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
+        atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Route"));
+        gtk_button_set_image (GTK_BUTTON (delete_button), image);
+        gtk_widget_set_halign (delete_button, GTK_ALIGN_CENTER);
+        gtk_widget_set_valign (delete_button, GTK_ALIGN_CENTER);
+        gtk_container_add (GTK_CONTAINER (row_box), delete_button);
+        g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
+
+        gtk_size_group_add_widget (self->routes_sizegroup, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (self->routes_list), row);
+
+        update_row_sensitivity (self, self->routes_list);
+}
+
+static void
+ensure_empty_routes_row (CEPageIP6 *self)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (self->routes_list));
+        l = children;
+
+        while (l && l->next)
+                l = l->next;
+
+        /* Add the last, stub row if needed*/
+        if (!l || validate_row (l->data))
+                add_route_row (self, "", NULL, "", NULL);
+
+        g_list_free (children);
+}
+
+static void
+add_empty_route_row (CEPageIP6 *self)
+{
+        add_route_row (self, "", NULL, "", NULL);
+}
+
+static void
+add_routes_box (CEPageIP6 *self)
+{
+        GtkWidget *list;
+        gint i;
+
+        self->routes_list = list = gtk_list_box_new ();
+        gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
+        gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (self->routes_box), list);
+        gtk_switch_set_active (self->auto_routes_switch, !nm_setting_ip_config_get_ignore_auto_routes (self->setting));
+        g_signal_connect_object (self->auto_routes_switch, "notify::active", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+
+        for (i = 0; i < nm_setting_ip_config_get_num_routes (self->setting); i++) {
+                NMIPRoute *route;
+                g_autofree gchar *prefix = NULL;
+                g_autofree gchar *metric = NULL;
+
+                route = nm_setting_ip_config_get_route (self->setting, i);
+                prefix = g_strdup_printf ("%u", nm_ip_route_get_prefix (route));
+                metric = g_strdup_printf ("%" G_GINT64_FORMAT, nm_ip_route_get_metric (route));
+                add_route_row (self, nm_ip_route_get_dest (route),
+                               prefix,
+                               nm_ip_route_get_next_hop (route),
+                               metric);
+        }
+        if (nm_setting_ip_config_get_num_routes (self->setting) == 0)
+                add_empty_route_row (self);
+
+        gtk_widget_show_all (GTK_WIDGET (self->routes_box));
+}
+
+static void
+connect_ip6_page (CEPageIP6 *self)
+{
+        const gchar *str_method;
+        guint method;
+
+        add_address_box (self);
+        add_dns_section (self);
+        add_routes_box (self);
+
+        str_method = nm_setting_ip_config_get_method (self->setting);
+        g_signal_connect_object (self->disabled_radio, "notify::active", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_object_bind_property (self->disabled_radio, "active",
+                                self->content_box, "sensitive",
+                                G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+        g_signal_connect_object (self->shared_radio, "notify::active", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+        g_object_bind_property (self->shared_radio, "active",
+                                self->content_box, "sensitive",
+                                G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+        method = IP6_METHOD_AUTO;
+        if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0) {
+                method = IP6_METHOD_DHCP;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) {
+                method = IP6_METHOD_LINK_LOCAL;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL) == 0) {
+                method = IP6_METHOD_MANUAL;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_SHARED) == 0) {
+                method = IP6_METHOD_SHARED;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED) == 0 ||
+                   g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0) {
+                method = IP6_METHOD_DISABLED;
+        }
+
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->never_default_check),
+                                      nm_setting_ip_config_get_never_default (self->setting));
+        g_signal_connect_object (self->never_default_check, "toggled", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+
+        g_signal_connect_object (self->automatic_radio, "toggled", G_CALLBACK (method_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (self->dhcp_radio, "toggled", G_CALLBACK (method_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (self->local_radio, "toggled", G_CALLBACK (method_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (self->manual_radio, "toggled", G_CALLBACK (method_changed), self, G_CONNECT_SWAPPED);
+        g_signal_connect_object (self->disabled_radio, "toggled", G_CALLBACK (method_changed), self, G_CONNECT_SWAPPED);
+
+        switch (method) {
+        case IP6_METHOD_AUTO:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->automatic_radio), TRUE);
+                break;
+        case IP6_METHOD_DHCP:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->dhcp_radio), TRUE);
+                break;
+        case IP6_METHOD_LINK_LOCAL:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->local_radio), TRUE);
+                break;
+        case IP6_METHOD_MANUAL:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->manual_radio), TRUE);
+                break;
+        case IP6_METHOD_SHARED:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->shared_radio), TRUE);
+                break;
+        case IP6_METHOD_DISABLED:
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->disabled_radio), TRUE);
+                break;
+        default:
+                break;
+        }
+
+        method_changed (self);
+}
+
+static gboolean
+ui_to_setting (CEPageIP6 *self)
+{
+        const gchar *method;
+        gboolean ignore_auto_dns;
+        gboolean ignore_auto_routes;
+        gboolean never_default;
+        GList *children, *l;
+        gboolean ret = TRUE;
+        GStrv dns_addresses = NULL;
+        gchar *dns_text = NULL;
+        guint i;
+
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->disabled_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_DISABLED;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->manual_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->local_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->dhcp_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_DHCP;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->automatic_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->shared_radio)))
+                method = NM_SETTING_IP6_CONFIG_METHOD_SHARED;
+
+        nm_setting_ip_config_clear_addresses (self->setting);
+        if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
+                children = gtk_container_get_children (GTK_CONTAINER (self->address_list));
+        } else {
+                g_object_set (G_OBJECT (self->setting),
+                              NM_SETTING_IP_CONFIG_GATEWAY, NULL,
+                              NULL);
+                children = NULL;
+       }
+
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkEntry *entry;
+                const gchar *text_address;
+                const gchar *text_prefix;
+                const gchar *text_gateway;
+                guint32 prefix;
+                gchar *end;
+                NMIPAddress *addr;
+                gboolean have_gateway = FALSE;
+
+                entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address"));
+                if (!entry)
+                        continue;
+
+                text_address = gtk_entry_get_text (entry);
+                text_prefix = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "prefix")));
+                text_gateway = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "gateway")));
+
+                if (!*text_address && !*text_prefix && !*text_gateway) {
+                        /* ignore empty rows */
+                        widget_unset_error (GTK_WIDGET (entry));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        continue;
+                }
+
+                if (!*text_address || !nm_utils_ipaddr_valid (AF_INET6, text_address)) {
+                        widget_set_error (GTK_WIDGET (entry));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (entry));
+                }
+
+                prefix = strtoul (text_prefix, &end, 10);
+                if (!end || *end || prefix == 0 || prefix > 128) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                }
+
+                if (*text_gateway && !nm_utils_ipaddr_valid (AF_INET6, text_gateway)) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        if (*text_gateway)
+                                have_gateway = TRUE;
+                }
+
+                if (!ret)
+                        continue;
+
+                addr = nm_ip_address_new (AF_INET6, text_address, prefix, NULL);
+                if (have_gateway)
+                        g_object_set (G_OBJECT (self->setting),
+                                      NM_SETTING_IP_CONFIG_GATEWAY, text_gateway,
+                                      NULL);
+                nm_setting_ip_config_add_address (self->setting, addr);
+
+                if (!l || !l->next)
+                        ensure_empty_address_row (self);
+        }
+        g_list_free (children);
+
+        nm_setting_ip_config_clear_dns (self->setting);
+        dns_text = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (self->dns_entry))));
+
+        if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) ||
+            g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) ||
+            g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL))
+                dns_addresses = g_strsplit_set (dns_text, ", ", -1);
+        else
+                dns_addresses = NULL;
+
+        for (i = 0; dns_addresses && dns_addresses[i]; i++) {
+                const gchar *text;
+                struct in6_addr tmp_addr;
+
+                text = dns_addresses[i];
+
+                if (!text || !*text)
+                        continue;
+
+                if (inet_pton (AF_INET6, text, &tmp_addr) <= 0) {
+                        g_clear_pointer (&dns_addresses, g_strfreev);
+                        widget_set_error (GTK_WIDGET (self->dns_entry));
+                        ret = FALSE;
+                        break;
+                } else {
+                        widget_unset_error (GTK_WIDGET (self->dns_entry));
+                        nm_setting_ip_config_add_dns (self->setting, text);
+                }
+        }
+
+        nm_setting_ip_config_clear_routes (self->setting);
+        if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) ||
+            g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) ||
+            g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL))
+                children = gtk_container_get_children (GTK_CONTAINER (self->routes_list));
+        else
+                children = NULL;
+
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkEntry *entry;
+                const gchar *text_address;
+                const gchar *text_prefix;
+                const gchar *text_gateway;
+                const gchar *text_metric;
+                guint32 prefix;
+                gint64 metric;
+                gchar *end;
+                NMIPRoute *route;
+
+                entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address"));
+                if (!entry)
+                        continue;
+
+                text_address = gtk_entry_get_text (entry);
+                text_prefix = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "prefix")));
+                text_gateway = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "gateway")));
+                text_metric = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "metric")));
+
+                if (!*text_address && !*text_prefix && !*text_gateway && !*text_metric) {
+                        /* ignore empty rows */
+                        widget_unset_error (GTK_WIDGET (entry));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "metric"));
+                        continue;
+                }
+
+                if (!nm_utils_ipaddr_valid (AF_INET6, text_address)) {
+                        widget_set_error (GTK_WIDGET (entry));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (entry));
+                }
+
+                prefix = strtoul (text_prefix, &end, 10);
+                if (!end || *end || prefix == 0 || prefix > 128) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix"));
+                }
+
+                if (!nm_utils_ipaddr_valid (AF_INET6, text_gateway)) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                }
+
+                metric = -1;
+                if (*text_metric) {
+                        errno = 0;
+                        metric = g_ascii_strtoull (text_metric, NULL, 10);
+                        if (errno) {
+                                widget_set_error (g_object_get_data (G_OBJECT (row), "metric"));
+                                ret = FALSE;
+                        } else {
+                                widget_unset_error (g_object_get_data (G_OBJECT (row), "metric"));
+                        }
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "metric"));
+                }
+
+                if (!ret)
+                        continue;
+
+                route = nm_ip_route_new (AF_INET6, text_address, prefix, text_gateway, metric, NULL);
+                nm_setting_ip_config_add_route (self->setting, route);
+                nm_ip_route_unref (route);
+
+                if (!l || !l->next)
+                        ensure_empty_routes_row (self);
+        }
+        g_list_free (children);
+
+        if (!ret)
+                goto out;
+
+        ignore_auto_dns = !gtk_switch_get_active (self->auto_dns_switch);
+        ignore_auto_routes = !gtk_switch_get_active (self->auto_routes_switch);
+        never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->never_default_check));
+
+        g_object_set (self->setting,
+                      NM_SETTING_IP_CONFIG_METHOD, method,
+                      NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
+                      NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes,
+                      NM_SETTING_IP_CONFIG_NEVER_DEFAULT, never_default,
+                      NULL);
+
+out:
+        g_clear_pointer (&dns_addresses, g_strfreev);
+        g_clear_pointer (&dns_text, g_free);
+
+        return ret;
+}
+
+static const gchar *
+ce_page_ip6_get_title (CEPage *page)
+{
+        return _("IPv6");
+}
+
+static gboolean
+ce_page_ip6_validate (CEPage        *self,
+                      NMConnection  *connection,
+                      GError       **error)
+{
+        if (!ui_to_setting (CE_PAGE_IP6 (self)))
+                return FALSE;
+
+        return nm_setting_verify (NM_SETTING (CE_PAGE_IP6 (self)->setting), NULL, error);
+}
+
+static void
+ce_page_ip6_init (CEPageIP6 *self)
+{
+        gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+static void
+ce_page_ip6_class_init (CEPageIP6Class *klass)
+{
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/ip6-page.ui");
+
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, address_box);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, address_sizegroup);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, auto_dns_switch);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, auto_routes_switch);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, automatic_radio);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, content_box);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, dhcp_radio);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, disabled_radio);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, dns_entry);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, local_radio);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, manual_radio);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, never_default_check);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, routes_box);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, routes_metric_sizegroup);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, routes_sizegroup);
+        gtk_widget_class_bind_template_child (widget_class, CEPageIP6, shared_radio);
+}
+
+static void
+ce_page_iface_init (CEPageInterface *iface)
+{
+        iface->get_title = ce_page_ip6_get_title;
+        iface->validate = ce_page_ip6_validate;
+}
+
+CEPageIP6 *
+ce_page_ip6_new (NMConnection     *connection,
+                 NMClient         *client)
+{
+        CEPageIP6 *self;
+
+        self = CE_PAGE_IP6 (g_object_new (ce_page_ip6_get_type (), NULL));
+
+        self->setting = nm_connection_get_setting_ip6_config (connection);
+        if (!self->setting) {
+                self->setting = NM_SETTING_IP_CONFIG (nm_setting_ip6_config_new ());
+                nm_connection_add_setting (connection, NM_SETTING (self->setting));
+        }
+
+        connect_ip6_page (self);
+
+        return self;
+}