Merge lp:~khurshid-alam/unity-control-center/libnm-port into lp:unity-control-center

[Khurshid Alam]

Network: Port to libnm 1.2

Reference: https://bugzilla.gnome.org/show_bug.cgi?id=765910

This is a direct port from gnome-control-center 3.26. Connection editor & wireless security codes are basically the same. Simply use directory comparison with meld for easier comparison or review.

I would have cherry picked more commits for connection-editor & wifi-security from 3.28/3.30, but in 3.28 they broke away wifi panel and the code is tied with that. But 3.26 is stable and Linux Mint Cinnamon is also using the same.

PPA: ppa:unity7maintainers/unity7-desktop

Community-Thread: https://community.ubuntu.com/t/testing-of-new-wetwork-panel-in-unity-libnm-port-1-2-eoan/10792

Other details:
---------------------

1) Gnome started using g-s-d for switching on/off Airplane mode. We will follow that. Hence rfkill related code was removed from cc-network-panel.c. See https://bugzilla.gnome.org/show_bug.cgi?id=703411 and https://github.com/GNOME/gnome-control-center/commit/085e7695133ae482cfbba78ab151a90a3960052d

2) In g-c-c new VPN connections are created within the control center from 8a52138cf6e31d1030ea2829acb6ec96892a8d8c and other types
currently hit the nm-connection-editor fallback. We are doing the same here. For vpn & otype of conection it will simply fall back using nm-connection-editor See https://bugzilla.gnome.org/show_bug.cgi?id=674498 and https://github.com/GNOME/gnome-control-center/commit/8a52138cf6e31d1030ea2829acb6ec96892a8d8c

3) This also includes support for the 'ModemManager1' interface. See https://github.com/GNOME/gnome-control-center/commit/0225d1a9e73cf741f627d595925abb7e886164be

[Sebastien Bacher (seb128)]

Thanks for the work, I don't think it makes sense to review the code there since it's a lot of change and basically a backport from upstream code already used in GNOME, let's rather go through functional testing. Landing the change (especially early in the cycle) is +1 from me, let me know when you are happy uploading

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2018-11-20 08:48:24 +0000
+++ configure.ac	2019-05-01 13:56:52 +0000
@@ -113,7 +113,9 @@
 CANBERRA_REQUIRED_VERSION=0.13
 GDKPIXBUF_REQUIRED_VERSION=2.23.0
 POLKIT_REQUIRED_VERSION=0.103
-NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
+NETWORK_MANAGER_REQUIRED_VERSION=1.2.0
+NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
+MODEM_MANAGER_REQUIRED_VERSION=0.7
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
 SCHEMAS_REQUIRED_VERSION=3.15.4
@@ -149,7 +151,8 @@
 PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
                   unity-settings-daemon x11)
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
                   unity-settings-daemon)
 PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
@@ -182,14 +185,16 @@
 GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
 AC_SUBST(GDESKTOP_PREFIX)
 
-# Check for NetworkManager ~0.9
-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
-                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
-                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
-                  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION,
+# Check for NetworkManager ~1.2
+PKG_CHECK_MODULES(NETWORK_MANAGER,
+                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+                  libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+		          mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
                   [have_networkmanager=yes], have_networkmanager=no)
 if test "x$have_networkmanager" = xno ; then
-        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***)
+        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~1.2 or newer not found) ***)
+else
+	AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
 fi
 AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
 
@@ -516,6 +521,8 @@
 panels/printers/Makefile
 panels/printers/unity-printers-panel.desktop.in
 panels/network/Makefile
+panels/network/wireless-security/Makefile
+panels/network/connection-editor/Makefile
 panels/network/unity-network-panel.desktop.in
 panels/universal-access/Makefile
 panels/universal-access/unity-universal-access-panel.desktop.in

=== modified file 'debian/control'
--- debian/control	2019-01-09 16:51:00 +0000
+++ debian/control	2019-05-01 13:56:52 +0000
@@ -35,9 +35,9 @@
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
                libkrb5-dev,
-               libnm-glib-dev (>= 0.9) [linux-any],
-               libnm-gtk-dev (>= 0.9) [linux-any],
-               libnm-util-dev (>= 0.9) [linux-any],
+               libnm-dev (>= 1.2.0) [linux-any],
+               libnma-dev (>= 1.2.0) [linux-any],
+               libmm-glib-dev [linux-any],
                libnotify-dev (>= 0.7.3),
                libpolkit-gobject-1-dev (>= 0.103),
                libpulse-dev (>= 1:2.0),

=== modified file 'panels/network/Makefile.am'
--- panels/network/Makefile.am	2017-04-06 13:23:05 +0000
+++ panels/network/Makefile.am	2019-05-01 13:56:52 +0000
@@ -1,19 +1,26 @@
 cappletname = network
 
-INCLUDES = 						\
+SUBDIRS = wireless-security connection-editor
+
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(NETWORK_PANEL_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+	-I$(srcdir)/wireless-security			\
 	$(NULL)
 
 ccpanelsdir = $(PANELS_DIR)
 ccpanels_LTLIBRARIES = libnetwork.la
 
+BUILT_SOURCES =			\
+	cc-network-resources.c	\
+	cc-network-resources.h
+
 libnetwork_la_SOURCES =					\
-	network-module.c				\
+	$(BUILT_SOURCES)				\
 	panel-common.c					\
 	panel-common.h					\
 	net-object.c					\
@@ -22,45 +29,31 @@
 	net-device.h					\
 	net-device-wifi.c				\
 	net-device-wifi.h				\
-	net-device-wired.c				\
-	net-device-wired.h				\
+	net-device-simple.c				\
+	net-device-simple.h				\
+	net-device-ethernet.c				\
+	net-device-ethernet.h				\
 	net-device-mobile.c				\
 	net-device-mobile.h				\
 	net-vpn.c					\
 	net-vpn.h					\
 	net-proxy.c					\
 	net-proxy.h					\
-	panel-cell-renderer-mode.c			\
-	panel-cell-renderer-mode.h			\
-	panel-cell-renderer-security.c			\
-	panel-cell-renderer-security.h			\
-	panel-cell-renderer-signal.c			\
-	panel-cell-renderer-signal.h			\
-	panel-cell-renderer-separator.c			\
-	panel-cell-renderer-separator.h			\
-	panel-cell-renderer-text.c			\
-	panel-cell-renderer-text.h			\
-	panel-cell-renderer-pixbuf.c			\
-	panel-cell-renderer-pixbuf.h			\
 	network-dialogs.c				\
 	network-dialogs.h				\
+	network-module.c				\
 	cc-network-panel.c				\
-	cc-network-panel.h				\
-	rfkill-glib.c					\
-	rfkill-glib.h					\
-	rfkill.h
-
-libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS)
+	cc-network-panel.h
+
+libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la
+
 libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
 
-uidir = $(pkgdatadir)/ui
-dist_ui_DATA =						\
-	network-proxy.ui				\
-	network-vpn.ui					\
-	network-wifi.ui					\
-	network-wired.ui				\
-	network-mobile.ui				\
-	network.ui
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/network.gresource.xml)
+cc-network-resources.c: network.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_network $<
+cc-network-resources.h: network.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_network $<
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -68,6 +61,7 @@
 desktop_in_files = unity-network-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-CLEANFILES = $(desktop_in_files) $(desktop_DATA)
+CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
+EXTRA_DIST = $(resource_files) network.gresource.xml
 
 -include $(top_srcdir)/git.mk

=== modified file 'panels/network/cc-network-panel.c'
--- panels/network/cc-network-panel.c	2016-03-09 21:55:46 +0000
+++ panels/network/cc-network-panel.c	2019-05-01 13:56:52 +0000
@@ -2,6 +2,7 @@
  *
  * Copyright (C) 2010-2012 Richard Hughes <[e-mail]>
  * Copyright (C) 2012 Thomas Bechtold <[e-mail]>
+ * Copyright (C) 2013 Aleksander Morgado <[e-mail]>
  *
  * 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
@@ -14,8 +15,7 @@
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -24,25 +24,24 @@
 #include <stdlib.h>
 
 #include "cc-network-panel.h"
+#include "cc-network-resources.h"
 
-#include "nm-remote-settings.h"
-#include "nm-client.h"
-#include "nm-device.h"
-#include "nm-device-modem.h"
+#include <NetworkManager.h>
 
 #include "net-device.h"
 #include "net-device-mobile.h"
 #include "net-device-wifi.h"
-#include "net-device-wired.h"
+#include "net-device-ethernet.h"
 #include "net-object.h"
 #include "net-proxy.h"
 #include "net-vpn.h"
 
-#include "rfkill-glib.h"
-
 #include "panel-common.h"
 
 #include "network-dialogs.h"
+#include "connection-editor/net-connection-editor.h"
+
+#include <libmm-glib.h>
 
 CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
 
@@ -64,17 +63,13 @@
         GtkBuilder       *builder;
         GtkWidget        *treeview;
         NMClient         *client;
-        NMRemoteSettings *remote_settings;
+        MMManager        *modem_manager;
         gboolean          updating_device;
-        guint             add_header_widgets_idle;
-        guint             nm_warning_idle;
-        guint             refresh_idle;
 
         /* Killswitch stuff */
+        GDBusProxy       *rfkill_proxy;
         GtkWidget        *kill_switch_header;
-        CcRfkillGlib       *rfkill;
         GtkSwitch        *rfkill_switch;
-        GHashTable       *killswitches;
 
         /* wireless dialog stuff */
         CmdlineOperation  arg_operation;
@@ -85,8 +80,6 @@
 
 enum {
         PANEL_DEVICES_COLUMN_ICON,
-        PANEL_DEVICES_COLUMN_TITLE,
-        PANEL_DEVICES_COLUMN_SORT,
         PANEL_DEVICES_COLUMN_OBJECT,
         PANEL_DEVICES_COLUMN_LAST
 };
@@ -96,7 +89,7 @@
         PROP_ARGV
 };
 
-static NetObject *find_in_model_by_id (CcNetworkPanel *panel, const gchar *id);
+static NetObject *find_in_model_by_id (CcNetworkPanel *panel, const gchar *id, GtkTreeIter *iter_out);
 static void handle_argv (CcNetworkPanel *panel);
 
 static void
@@ -205,27 +198,13 @@
                 g_cancellable_cancel (priv->cancellable);
 
         g_clear_object (&priv->cancellable);
+        g_clear_object (&priv->rfkill_proxy);
         g_clear_object (&priv->builder);
         g_clear_object (&priv->client);
-        g_clear_object (&priv->remote_settings);
+        g_clear_object (&priv->modem_manager);
         g_clear_object (&priv->kill_switch_header);
-        g_clear_object (&priv->rfkill);
-        g_clear_pointer (&priv->killswitches, g_hash_table_destroy);
         priv->rfkill_switch = NULL;
 
-        if (priv->refresh_idle != 0) {
-                g_source_remove (priv->refresh_idle);
-                priv->refresh_idle = 0;
-        }
-        if (priv->nm_warning_idle != 0) {
-                g_source_remove (priv->nm_warning_idle);
-                priv->nm_warning_idle = 0;
-        }
-        if (priv->add_header_widgets_idle != 0) {
-                g_source_remove (priv->add_header_widgets_idle);
-                priv->add_header_widgets_idle = 0;
-        }
-
         G_OBJECT_CLASS (cc_network_panel_parent_class)->dispose (object);
 }
 
@@ -242,7 +221,132 @@
 static const char *
 cc_network_panel_get_help_uri (CcPanel *panel)
 {
-        return "help:ubuntu-help/net";
+	return "help:gnome-help/net";
+}
+
+static void
+cc_network_panel_notify_enable_active_cb (GtkSwitch *sw,
+                                          GParamSpec *pspec,
+                                          CcNetworkPanel *panel)
+{
+        CcNetworkPanelPrivate *priv = panel->priv;
+	gboolean enable;
+	enable = gtk_switch_get_active (sw);
+        g_dbus_proxy_call (priv->rfkill_proxy,
+                           "org.freedesktop.DBus.Properties.Set",
+                           g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill',"
+                                                 "'AirplaneMode', %v)",
+                                                 g_variant_new_boolean (enable)),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           priv->cancellable,
+                           NULL, NULL);
+}
+
+static void
+sync_airplane_mode_switch (CcNetworkPanel *panel)
+{
+        GVariant *result;
+        gboolean enabled, should_show;
+        gboolean hw_enabled;
+
+        result = g_dbus_proxy_get_cached_property (panel->priv->rfkill_proxy, "HasAirplaneMode");
+        enabled = g_variant_get_boolean (result);
+
+        result = g_dbus_proxy_get_cached_property (panel->priv->rfkill_proxy, "ShouldShowAirplaneMode");
+        should_show = g_variant_get_boolean (result);
+
+        gtk_widget_set_visible (GTK_WIDGET (panel->priv->kill_switch_header), enabled && should_show);
+        if (!enabled || !should_show)
+                return;
+
+        result = g_dbus_proxy_get_cached_property (panel->priv->rfkill_proxy, "AirplaneMode");
+        enabled = g_variant_get_boolean (result);
+
+        result = g_dbus_proxy_get_cached_property (panel->priv->rfkill_proxy, "HardwareAirplaneMode");
+        hw_enabled = !!g_variant_get_boolean (result);
+
+	enabled |= hw_enabled;
+
+	if (enabled != gtk_switch_get_active (panel->priv->rfkill_switch)) {
+		g_signal_handlers_block_by_func (panel->priv->rfkill_switch,
+						 cc_network_panel_notify_enable_active_cb,
+						 panel);
+		gtk_switch_set_active (panel->priv->rfkill_switch, enabled);
+		g_signal_handlers_unblock_by_func (panel->priv->rfkill_switch,
+						 cc_network_panel_notify_enable_active_cb,
+						 panel);
+	}
+
+	gtk_widget_set_sensitive (GTK_WIDGET (panel->priv->rfkill_switch), !hw_enabled);
+}
+
+static void
+on_property_change (GDBusProxy *proxy,
+                    GVariant   *changed_properties,
+                    GVariant   *invalidated_properties,
+                    gpointer    user_data)
+{
+        sync_airplane_mode_switch (CC_NETWORK_PANEL (user_data));
+}
+
+static void
+got_rfkill_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+        GError *error = NULL;
+        CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
+
+        panel->priv->rfkill_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+        if (panel->priv->rfkill_proxy == NULL) {
+                g_printerr ("Error creating rfkill proxy: %s\n", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        g_signal_connect (panel->priv->rfkill_proxy, "g-properties-changed",
+                          G_CALLBACK (on_property_change), panel);
+        sync_airplane_mode_switch (panel);
+}
+
+static void
+cc_network_panel_constructed (GObject *object)
+{
+        CcNetworkPanel *panel = CC_NETWORK_PANEL (object);
+        GtkWidget *box;
+        GtkWidget *label;
+        GtkWidget *widget;
+
+        G_OBJECT_CLASS (cc_network_panel_parent_class)->constructed (object);
+
+        /* add kill switch widgets  */
+        box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+        /* TRANSLATORS: this is to disable the radio hardware in the
+         * network panel */
+        label = gtk_label_new_with_mnemonic (_("Air_plane Mode"));
+        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+        gtk_widget_set_visible (label, TRUE);
+        widget = gtk_switch_new ();
+        gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
+        gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 4);
+        gtk_widget_show_all (box);
+        panel->priv->rfkill_switch = GTK_SWITCH (widget);
+        cc_shell_embed_widget_in_header (cc_panel_get_shell (CC_PANEL (panel)), box);
+        panel->priv->kill_switch_header = g_object_ref (box);
+
+        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                  G_DBUS_PROXY_FLAGS_NONE,
+                                  NULL,
+                                  "org.gnome.SettingsDaemon.Rfkill",
+                                  "/org/gnome/SettingsDaemon/Rfkill",
+                                  "org.gnome.SettingsDaemon.Rfkill",
+                                  panel->priv->cancellable,
+                                  got_rfkill_proxy_cb,
+                                  panel);
+
+        g_signal_connect (panel->priv->rfkill_switch, "notify::active",
+                          G_CALLBACK (cc_network_panel_notify_enable_active_cb),
+                          panel);
 }
 
 static void
@@ -259,6 +363,7 @@
         object_class->set_property = cc_network_panel_set_property;
         object_class->dispose = cc_network_panel_dispose;
         object_class->finalize = cc_network_panel_finalize;
+        object_class->constructed = cc_network_panel_constructed;
 
         g_object_class_override_property (object_class, PROP_ARGV, "argv");
 }
@@ -333,16 +438,140 @@
                 if (g_strcmp0 (net_object_get_id (object),
                                net_object_get_id (object_tmp)) == 0) {
                         g_object_unref (object_tmp);
-                        if (!gtk_list_store_remove (GTK_LIST_STORE (model), &iter))
-                                gtk_tree_model_get_iter_first (model, &iter);
-                        gtk_tree_selection_select_iter (selection, &iter);
-
+                        if (gtk_list_store_remove (GTK_LIST_STORE (model), &iter)) {
+                                if (gtk_tree_model_get_iter_first (model, &iter))
+                                        gtk_tree_selection_select_iter (selection, &iter);
+                        }
                         break;
                 }
                 g_object_unref (object_tmp);
         } while (gtk_tree_model_iter_next (model, &iter));
 }
 
+GPtrArray *
+cc_network_panel_get_devices (CcNetworkPanel *panel)
+{
+        GPtrArray *devices;
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+        NetObject *object;
+
+        devices = g_ptr_array_new_with_free_func (g_object_unref);
+
+        model = GTK_TREE_MODEL (gtk_builder_get_object (panel->priv->builder,
+                                                        "liststore_devices"));
+        if (!gtk_tree_model_get_iter_first (model, &iter))
+                return devices;
+
+        do {
+                gtk_tree_model_get (model, &iter,
+                                    PANEL_DEVICES_COLUMN_OBJECT, &object,
+                                    -1);
+                if (NET_IS_DEVICE (object))
+                        g_ptr_array_add (devices, object);
+                else
+                        g_object_unref (object);
+        } while (gtk_tree_model_iter_next (model, &iter));
+
+        return devices;
+}
+
+static gint
+panel_net_object_get_sort_category (NetObject *net_object)
+{
+        if (NET_IS_DEVICE (net_object)) {
+                return panel_device_get_sort_category (net_device_get_nm_device (NET_DEVICE (net_object)));
+        } else if (NET_IS_PROXY (net_object)) {
+                return 9;
+        } else if (NET_IS_VPN (net_object)) {
+                return 5;
+        }
+
+        g_assert_not_reached ();
+}
+
+static gint
+panel_net_object_sort_func (GtkTreeModel *model, GtkTreeIter *a,
+                            GtkTreeIter *b, void *data)
+{
+        g_autoptr(NetObject) obj_a = NULL;
+        g_autoptr(NetObject) obj_b = NULL;
+        gint cat_a, cat_b;
+
+        gtk_tree_model_get (model, a,
+                            PANEL_DEVICES_COLUMN_OBJECT, &obj_a,
+                            -1);
+        gtk_tree_model_get (model, b,
+                            PANEL_DEVICES_COLUMN_OBJECT, &obj_b,
+                            -1);
+
+        cat_a = panel_net_object_get_sort_category (obj_a);
+        cat_b = panel_net_object_get_sort_category (obj_b);
+
+        if (cat_a != cat_b)
+                return cat_a - cat_b;
+
+        return g_utf8_collate (net_object_get_title (obj_a), net_object_get_title (obj_b));
+}
+
+static void
+panel_net_object_notify_title_cb (NetObject *net_object, GParamSpec *pspec, CcNetworkPanel *panel)
+{
+        GtkTreeIter iter;
+        GtkListStore *liststore;
+
+        if (!find_in_model_by_id (panel, net_object_get_id (net_object), &iter))
+                return;
+
+        liststore = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
+                                                            "liststore_devices"));
+
+        /* gtk_tree_model_row_changed would not cause the list store to resort.
+         * Instead set the object column to the current value.
+         * See https://bugzilla.gnome.org/show_bug.cgi?id=782737 */
+        gtk_list_store_set (liststore, &iter,
+                            PANEL_DEVICES_COLUMN_OBJECT, net_object,
+                           -1);
+}
+
+static void
+panel_refresh_device_titles (CcNetworkPanel *panel)
+{
+        GPtrArray *ndarray, *nmdarray;
+        NetDevice **devices;
+        NMDevice **nm_devices, *nm_device;
+        gchar **titles;
+        gint i, num_devices;
+
+        ndarray = cc_network_panel_get_devices (panel);
+        if (!ndarray->len) {
+                g_ptr_array_free (ndarray, TRUE);
+                return;
+        }
+
+        nmdarray = g_ptr_array_new ();
+        for (i = 0; i < ndarray->len; i++) {
+                nm_device = net_device_get_nm_device (ndarray->pdata[i]);
+                if (nm_device)
+                        g_ptr_array_add (nmdarray, nm_device);
+                else
+                        g_ptr_array_remove_index (ndarray, i--);
+        }
+
+        devices = (NetDevice **)ndarray->pdata;
+        nm_devices = (NMDevice **)nmdarray->pdata;
+        num_devices = ndarray->len;
+
+        titles = nm_device_disambiguate_names (nm_devices, num_devices);
+        for (i = 0; i < num_devices; i++) {
+                net_object_set_title (NET_OBJECT (devices[i]), titles[i]);
+                g_free (titles[i]);
+        }
+        g_free (titles);
+        g_ptr_array_free (ndarray, TRUE);
+        g_ptr_array_free (nmdarray, TRUE);
+}
+
 static gboolean
 handle_argv_for_device (CcNetworkPanel *panel,
 			NMDevice       *device,
@@ -350,6 +579,7 @@
 {
         CcNetworkPanelPrivate *priv = panel->priv;
         NMDeviceType type;
+        GtkWidget *toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)));
 
         if (priv->arg_operation == OPERATION_NULL)
                 return TRUE;
@@ -363,21 +593,21 @@
                 select_tree_iter (panel, iter);
 
                 if (priv->arg_operation == OPERATION_CREATE_WIFI)
-                        cc_network_panel_create_wifi_network (panel, priv->client, priv->remote_settings);
+                        cc_network_panel_create_wifi_network (toplevel, priv->client);
                 else
-                        cc_network_panel_connect_to_hidden_network (panel, priv->client, priv->remote_settings);
+                        cc_network_panel_connect_to_hidden_network (toplevel, priv->client);
 
                 reset_command_line_args (panel); /* done */
                 return TRUE;
         } else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) {
                 if (priv->arg_operation == OPERATION_CONNECT_MOBILE) {
-                        cc_network_panel_connect_to_3g_network (panel, priv->client, priv->remote_settings, device);
+                        cc_network_panel_connect_to_3g_network (toplevel, priv->client, device);
 
                         reset_command_line_args (panel); /* done */
                         select_tree_iter (panel, iter);
                         return TRUE;
                 } else if (priv->arg_operation == OPERATION_CONNECT_8021X) {
-                        cc_network_panel_connect_to_8021x_network (panel, priv->client, priv->remote_settings, device, priv->arg_access_point);
+                        cc_network_panel_connect_to_8021x_network (toplevel, priv->client, device, priv->arg_access_point);
                         reset_command_line_args (panel); /* done */
                         select_tree_iter (panel, iter);
                         return TRUE;
@@ -392,6 +622,28 @@
         return FALSE;
 }
 
+static gboolean
+handle_argv_for_connection (CcNetworkPanel *panel,
+                            NMConnection   *connection,
+                            GtkTreeIter    *iter)
+{
+        CcNetworkPanelPrivate *priv = panel->priv;
+
+        if (priv->arg_operation == OPERATION_NULL)
+                return TRUE;
+        if (priv->arg_operation != OPERATION_SHOW_DEVICE)
+                return FALSE;
+
+        if (g_strcmp0 (nm_connection_get_path (connection), priv->arg_device) == 0) {
+                reset_command_line_args (panel);
+                select_tree_iter (panel, iter);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+
 static void
 handle_argv (CcNetworkPanel *panel)
 {
@@ -408,15 +660,20 @@
         while (ret) {
                 GObject *object_tmp;
                 NMDevice *device;
+                NMConnection *connection;
                 gboolean done = FALSE;
 
                 gtk_tree_model_get (model, &iter,
                                     PANEL_DEVICES_COLUMN_OBJECT, &object_tmp,
                                     -1);
-                if (g_object_class_find_property (G_OBJECT_GET_CLASS (object_tmp), "nm-device") != NULL) {
+                if (NET_IS_DEVICE (object_tmp)) {
                         g_object_get (object_tmp, "nm-device", &device, NULL);
                         done = handle_argv_for_device (panel, device, &iter);
                         g_object_unref (device);
+                } else if (NET_IS_VPN (object_tmp)) {
+                        g_object_get (object_tmp, "connection", &connection, NULL);
+                        done = handle_argv_for_connection (panel, connection, &iter);
+                        g_object_unref (connection);
                 }
 
                 g_object_unref (object_tmp);
@@ -430,10 +687,31 @@
         g_debug ("Could not handle argv operation, no matching device yet?");
 }
 
+static void
+state_changed_cb (NMDevice *device,
+                  NMDeviceState new_state,
+                  NMDeviceState old_state,
+                  NMDeviceStateReason reason,
+                  CcNetworkPanel *panel)
+{
+        GtkListStore *store;
+        GtkTreeIter iter;
+
+        if (!find_in_model_by_id (panel, nm_device_get_udi (device), &iter)) {
+                return;
+        }
+
+        store = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
+                                                        "liststore_devices"));
+
+        gtk_list_store_set (store, &iter,
+                            PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device, TRUE),
+                           -1);
+}
+
 static gboolean
 panel_add_device (CcNetworkPanel *panel, NMDevice *device)
 {
-        const gchar *title;
         GtkListStore *liststore_devices;
         GtkTreeIter iter;
         NMDeviceType type;
@@ -442,20 +720,25 @@
         GtkNotebook *notebook;
         GtkSizeGroup *size_group;
         GType device_g_type;
+        const char *udi;
+
+        if (!nm_device_get_managed (device))
+                goto out;
 
         /* do we have an existing object with this id? */
-        if (find_in_model_by_id (panel, nm_device_get_udi (device)) != NULL)
+        udi = nm_device_get_udi (device);
+        if (find_in_model_by_id (panel, udi, NULL) != NULL)
                 goto out;
 
         type = nm_device_get_device_type (device);
 
         g_debug ("device %s type %i path %s",
-                 nm_device_get_udi (device), type, nm_object_get_path (NM_OBJECT (device)));
+                 udi, type, nm_object_get_path (NM_OBJECT (device)));
 
-        /* map the NMDeviceType to the GType */
+        /* map the NMDeviceType to the GType, or ignore */
         switch (type) {
         case NM_DEVICE_TYPE_ETHERNET:
-                device_g_type = NET_TYPE_DEVICE_WIRED;
+                device_g_type = NET_TYPE_DEVICE_ETHERNET;
                 break;
         case NM_DEVICE_TYPE_MODEM:
                 device_g_type = NET_TYPE_DEVICE_MOBILE;
@@ -463,23 +746,56 @@
         case NM_DEVICE_TYPE_WIFI:
                 device_g_type = NET_TYPE_DEVICE_WIFI;
                 break;
+        /* not going to set up a cluster in GNOME */
+        case NM_DEVICE_TYPE_VETH:
+        /* enterprise features */
+        case NM_DEVICE_TYPE_BOND:
+        case NM_DEVICE_TYPE_TEAM:
+        /* Don't need the libvirtd bridge */
+        case NM_DEVICE_TYPE_BRIDGE:
+        /* Don't add VPN devices */
+        case NM_DEVICE_TYPE_TUN:
+                goto out;
         default:
-                goto out;
+                device_g_type = NET_TYPE_DEVICE_SIMPLE;
+                break;
         }
 
         /* create device */
-        title = panel_device_to_localized_string (device);
         net_device = g_object_new (device_g_type,
                                    "panel", panel,
                                    "removable", FALSE,
                                    "cancellable", panel->priv->cancellable,
                                    "client", panel->priv->client,
-                                   "remote-settings", panel->priv->remote_settings,
                                    "nm-device", device,
                                    "id", nm_device_get_udi (device),
-                                   "title", title,
                                    NULL);
 
+        if (type == NM_DEVICE_TYPE_MODEM &&
+            g_str_has_prefix (nm_device_get_udi (device), "/org/freedesktop/ModemManager1/Modem/")) {
+                GDBusObject *modem_object;
+
+                if (priv->modem_manager == NULL) {
+                        g_warning ("Cannot grab information for modem at %s: No ModemManager support",
+                                   nm_device_get_udi (device));
+                        goto out;
+                }
+
+                modem_object = g_dbus_object_manager_get_object (G_DBUS_OBJECT_MANAGER (priv->modem_manager),
+                                                                 nm_device_get_udi (device));
+                if (modem_object == NULL) {
+                        g_warning ("Cannot grab information for modem at %s: Not found",
+                                   nm_device_get_udi (device));
+                        goto out;
+                }
+
+                /* Set the modem object in the NetDeviceMobile */
+                g_object_set (net_device,
+                              "mm-object", modem_object,
+                              NULL);
+                g_object_unref (modem_object);
+        }
+
         /* add as a panel */
         if (device_g_type != NET_TYPE_DEVICE) {
                 notebook = GTK_NOTEBOOK (gtk_builder_get_object (panel->priv->builder,
@@ -498,11 +814,15 @@
         gtk_list_store_append (liststore_devices, &iter);
         gtk_list_store_set (liststore_devices,
                             &iter,
-                            PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device),
-                            PANEL_DEVICES_COLUMN_SORT, panel_device_to_sortable_string (device),
-                            PANEL_DEVICES_COLUMN_TITLE, title,
+                            PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device, TRUE),
                             PANEL_DEVICES_COLUMN_OBJECT, net_device,
                             -1);
+        g_signal_connect (net_device, "notify::title",
+                          G_CALLBACK (panel_net_object_notify_title_cb), panel);
+
+        g_object_unref (net_device);
+        g_signal_connect (device, "state-changed",
+                          G_CALLBACK (state_changed_cb), panel);
 
 out:
         return FALSE;
@@ -539,6 +859,25 @@
 }
 
 static void
+get_object_title (GtkTreeViewColumn *column,
+                  GtkCellRenderer   *cell,
+                  GtkTreeModel      *model,
+                  GtkTreeIter       *iter,
+                  gpointer           data)
+{
+        NetObject *object;
+
+        gtk_tree_model_get (model, iter,
+                            PANEL_DEVICES_COLUMN_OBJECT, &object,
+                            -1);
+        if (!object)
+                return;
+
+        g_object_set (cell, "text", net_object_get_title (object), NULL);
+        g_object_unref (object);
+}
+
+static void
 panel_add_devices_columns (CcNetworkPanel *panel, GtkTreeView *treeview)
 {
         CcNetworkPanelPrivate *priv = panel->priv;
@@ -548,8 +887,13 @@
 
         /* image */
         renderer = gtk_cell_renderer_pixbuf_new ();
-        g_object_set (renderer, "stock-size", gtk_icon_size_from_name ("cc-sidebar-list"), NULL);
-        gtk_cell_renderer_set_padding (renderer, 4, 4);
+        g_object_set (renderer,
+                      "width", 32,
+                      "xalign", 1.0,
+                      "stock-size", GTK_ICON_SIZE_MENU,
+                      "follow-state", TRUE,
+                      NULL);
+        gtk_cell_renderer_set_padding (renderer, 4, 10);
 
         column = gtk_tree_view_column_new_with_attributes ("icon", renderer,
                                                            "icon-name", PANEL_DEVICES_COLUMN_ICON,
@@ -562,14 +906,19 @@
                       "wrap-mode", PANGO_WRAP_WORD,
                       "ellipsize", PANGO_ELLIPSIZE_END,
                       NULL);
-        column = gtk_tree_view_column_new_with_attributes ("title", renderer,
-                                                           "markup", PANEL_DEVICES_COLUMN_TITLE,
-                                                           NULL);
-        gtk_tree_view_column_set_sort_column_id (column, PANEL_DEVICES_COLUMN_SORT);
+        column = gtk_tree_view_column_new_with_attributes ("title", renderer, NULL);
+        gtk_tree_view_column_set_cell_data_func (GTK_TREE_VIEW_COLUMN (column),
+                                                 renderer,
+                                                 get_object_title,
+                                                 NULL, NULL);
+        gtk_tree_view_column_set_sort_column_id (column, PANEL_DEVICES_COLUMN_OBJECT);
         liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
                                             "liststore_devices"));
+        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (liststore_devices),
+                                         PANEL_DEVICES_COLUMN_OBJECT,
+                                         panel_net_object_sort_func, NULL, NULL);
         gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore_devices),
-                                              PANEL_DEVICES_COLUMN_SORT,
+                                              PANEL_DEVICES_COLUMN_OBJECT,
                                               GTK_SORT_ASCENDING);
         gtk_tree_view_append_column (treeview, column);
         gtk_tree_view_column_set_expand (column, TRUE);
@@ -616,6 +965,7 @@
                 }
                 i++;
         }
+        g_object_unref (object);
 out:
         g_list_free (panels);
 }
@@ -623,7 +973,6 @@
 static void
 panel_add_proxy_device (CcNetworkPanel *panel)
 {
-        gchar *title;
         GtkListStore *liststore_devices;
         GtkTreeIter iter;
         NetProxy *proxy;
@@ -643,39 +992,21 @@
         /* add proxy to device list */
         liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
                                             "liststore_devices"));
-        title = g_strdup_printf ("%s", _("Network proxy"));
+        net_object_set_title (NET_OBJECT (proxy), _("Network proxy"));
         gtk_list_store_append (liststore_devices, &iter);
         gtk_list_store_set (liststore_devices,
                             &iter,
-                            PANEL_DEVICES_COLUMN_ICON, "preferences-system-network",
-                            PANEL_DEVICES_COLUMN_TITLE, title,
-                            PANEL_DEVICES_COLUMN_SORT, "9",
+                            PANEL_DEVICES_COLUMN_ICON, "preferences-system-network-symbolic",
                             PANEL_DEVICES_COLUMN_OBJECT, proxy,
                             -1);
-        g_free (title);
+
+        /* NOTE: No connect to notify::title here as it is guaranteed to not
+         *       be changed by anyone.*/
+
         g_object_unref (proxy);
 }
 
 static void
-cc_network_panel_notify_enable_active_cb (GtkSwitch *sw,
-                                          GParamSpec *pspec,
-                                          CcNetworkPanel *panel)
-{
-	gboolean enable;
-	struct rfkill_event event;
-
-	enable = gtk_switch_get_active (sw);
-	g_debug ("Setting killswitch to %d", enable);
-
-	memset (&event, 0, sizeof(event));
-	event.op = RFKILL_OP_CHANGE_ALL;
-	event.type = RFKILL_TYPE_ALL;
-	event.soft = enable ? 1 : 0;
-	if (cc_rfkill_glib_send_event (panel->priv->rfkill, &event) < 0)
-		g_warning ("Setting the killswitch %s failed", enable ? "on" : "off");
-}
-
-static void
 connection_state_changed (NMActiveConnection *c, GParamSpec *pspec, CcNetworkPanel *panel)
 {
 }
@@ -699,7 +1030,7 @@
                 for (j = 0; devices && j < devices->len; j++)
                         g_debug ("           %s", nm_device_get_udi (g_ptr_array_index (devices, j)));
                 if (NM_IS_VPN_CONNECTION (connection))
-                        g_debug ("           VPN base connection: %s", nm_active_connection_get_specific_object (connection));
+                        g_debug ("           VPN base connection: %s", nm_active_connection_get_specific_object_path (connection));
 
                 if (g_object_get_data (G_OBJECT (connection), "has-state-changed-handler") == NULL) {
                         g_signal_connect_object (connection, "notify::state",
@@ -714,6 +1045,7 @@
 {
         g_debug ("New device added");
         panel_add_device (panel, device);
+        panel_refresh_device_titles (panel);
 }
 
 static void
@@ -721,6 +1053,7 @@
 {
         g_debug ("Device removed");
         panel_remove_device (panel, device);
+        panel_refresh_device_titles (panel);
 }
 
 static void
@@ -734,7 +1067,7 @@
         CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
 
         /* clear all devices we added */
-        if (!nm_client_get_manager_running (client)) {
+        if (!nm_client_get_nm_running (client)) {
                 g_debug ("NM disappeared");
                 liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
                                                     "liststore_devices"));
@@ -759,12 +1092,14 @@
                 select_first_device (panel);
         }
 
+        panel_refresh_device_titles (panel);
+
         g_debug ("Calling handle_argv() after cold-plugging devices");
         handle_argv (panel);
 }
 
 static NetObject *
-find_in_model_by_id (CcNetworkPanel *panel, const gchar *id)
+find_in_model_by_id (CcNetworkPanel *panel, const gchar *id, GtkTreeIter *iter_out)
 {
         gboolean ret;
         NetObject *object_tmp;
@@ -793,6 +1128,8 @@
                 }
         } while (object == NULL && gtk_tree_model_iter_next (model, &iter));
 out:
+        if (iter_out)
+                *iter_out = iter;
         return object;
 }
 
@@ -800,7 +1137,6 @@
 panel_add_vpn_device (CcNetworkPanel *panel, NMConnection *connection)
 {
         gchar *title;
-        gchar *title_markup;
         GtkListStore *liststore_devices;
         GtkTreeIter iter;
         NetVpn *net_vpn;
@@ -810,10 +1146,10 @@
 
         /* does already exist */
         id = nm_connection_get_path (connection);
-        if (find_in_model_by_id (panel, id) != NULL)
+        if (find_in_model_by_id (panel, id, NULL) != NULL)
                 return;
 
-        /* add as a virtual object */
+        /* add as a VPN object */
         net_vpn = g_object_new (NET_TYPE_VPN,
                                 "panel", panel,
                                 "removable", TRUE,
@@ -836,19 +1172,19 @@
         liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder,
                                             "liststore_devices"));
         title = g_strdup_printf (_("%s VPN"), nm_connection_get_id (connection));
-        title_markup = g_strdup (title);
 
         net_object_set_title (NET_OBJECT (net_vpn), title);
         gtk_list_store_append (liststore_devices, &iter);
         gtk_list_store_set (liststore_devices,
                             &iter,
-                            PANEL_DEVICES_COLUMN_ICON, "network-vpn",
-                            PANEL_DEVICES_COLUMN_TITLE, title_markup,
-                            PANEL_DEVICES_COLUMN_SORT, "5",
+                            PANEL_DEVICES_COLUMN_ICON, "network-vpn-symbolic",
                             PANEL_DEVICES_COLUMN_OBJECT, net_vpn,
                             -1);
+        g_signal_connect (net_vpn, "notify::title",
+                          G_CALLBACK (panel_net_object_notify_title_cb), panel);
+
         g_free (title);
-        g_free (title_markup);
+        g_object_unref (net_vpn);
 }
 
 static void
@@ -856,130 +1192,91 @@
                 NMConnection *connection)
 {
         NMSettingConnection *s_con;
-        const gchar *type;
+        const gchar *type, *iface;
 
         s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection,
                                                                   NM_TYPE_SETTING_CONNECTION));
         type = nm_setting_connection_get_connection_type (s_con);
-        if (g_strcmp0 (type, "vpn") != 0)
-                return;
+        iface = nm_connection_get_interface_name (connection);
+        if (g_strcmp0 (type, "vpn") != 0 && iface == NULL)
+                return;
+
+        /* Don't add the libvirtd bridge to the UI */
+        if (g_strcmp0 (nm_setting_connection_get_interface_name (s_con), "virbr0") == 0)
+                return;
+
         g_debug ("add %s/%s remote connection: %s",
                  type, g_type_name_from_instance ((GTypeInstance*)connection),
                  nm_connection_get_path (connection));
-        panel_add_vpn_device (panel, connection);
+        if (!iface)
+                panel_add_vpn_device (panel, connection);
 }
 
 static void
-notify_new_connection_cb (NMRemoteSettings *settings,
-                          NMRemoteConnection *connection,
-                          CcNetworkPanel *panel)
+notify_connection_added_cb (NMClient           *client,
+                            NMRemoteConnection *connection,
+                            CcNetworkPanel     *panel)
 {
         add_connection (panel, NM_CONNECTION (connection));
 }
 
 static void
-notify_connections_read_cb (NMRemoteSettings *settings,
-                            CcNetworkPanel *panel)
-{
-        GSList *list, *iter;
-        NMConnection *connection;
-
-        list = nm_remote_settings_list_connections (settings);
-        g_debug ("%p has %i remote connections",
-                 panel, g_slist_length (list));
-        for (iter = list; iter; iter = g_slist_next (iter)) {
-                connection = NM_CONNECTION (iter->data);
-                add_connection (panel, connection);
-        }
-}
-
-static gboolean
-display_version_warning_idle (CcNetworkPanel *panel)
-{
-        GtkWidget  *dialog;
-        GtkWidget  *image;
-        GtkWindow  *window;
-        const char *message;
-
-        /* TRANSLATORS: the user is running a NM that is not API compatible */
-        message = _("The system network services are not compatible with this version.");
-
-        window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (panel)));
-        dialog = gtk_message_dialog_new (window,
-                                         GTK_DIALOG_MODAL,
-                                         GTK_MESSAGE_ERROR,
-                                         GTK_BUTTONS_CLOSE,
-                                         "%s",
-                                         message);
-        image = gtk_image_new_from_icon_name ("computer-fail", GTK_ICON_SIZE_DIALOG);
-        gtk_widget_show (image);
-        gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
-
-        gtk_dialog_run (GTK_DIALOG (dialog));
-        gtk_widget_destroy (dialog);
-
-        return FALSE;
-}
-
-static gboolean
 panel_check_network_manager_version (CcNetworkPanel *panel)
 {
+        GtkWidget *box;
+        GtkWidget *label;
+        gchar *markup;
         const gchar *version;
-        guint minor = 0;
-        gboolean ret = TRUE;
 
         /* parse running version */
         version = nm_client_get_version (panel->priv->client);
         if (version == NULL) {
-                ret = FALSE;
-
-                /* do modal dialog in idle so we don't block startup */
-                panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+                gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
+
+                box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
+                gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
+                gtk_widget_set_vexpand (box, TRUE);
+                gtk_container_add (GTK_CONTAINER (panel), box);
+
+                label = gtk_label_new (_("Oops, something has gone wrong. Please contact your software vendor."));
+                gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+                gtk_widget_set_valign (label, GTK_ALIGN_END);
+                gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+
+                markup = g_strdup_printf ("<small><tt>%s</tt></small>",
+                                          _("NetworkManager needs to be running."));
+                label = gtk_label_new (NULL);
+                gtk_label_set_markup (GTK_LABEL (label), markup);
+                gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+                gtk_widget_set_valign (label, GTK_ALIGN_START);
+                gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+
+                gtk_widget_show_all (box);
+                g_free (markup);
+        } else {
+                manager_running (panel->priv->client, NULL, panel);
         }
+}
 
-        return ret;
+static void
+editor_done (NetConnectionEditor *editor,
+             gboolean             success,
+             gpointer             user_data)
+{
+        g_object_unref (editor);
 }
 
 static void
 add_connection_cb (GtkToolButton *button, CcNetworkPanel *panel)
 {
-        GtkWidget *dialog;
-        gint response;
-
-        dialog = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
-                                                     "connection_type_dialog"));
-        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (panel))));
-
-        response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-        gtk_widget_hide (dialog);
-
-        if (response == GTK_RESPONSE_OK) {
-                GtkComboBox *combo;
-                GtkTreeModel *model;
-                GtkTreeIter iter;
-                gchar *type;
-                gchar *cmdline;
-                GError *error;
-
-                combo = GTK_COMBO_BOX (gtk_builder_get_object (panel->priv->builder,
-                                                               "connection_type_combo"));
-                model = gtk_combo_box_get_model (combo);
-                gtk_combo_box_get_active_iter (combo, &iter);
-                type = NULL;
-                gtk_tree_model_get (model, &iter, 1, &type, -1);
-
-                cmdline = g_strdup_printf ("nm-connection-editor --create --type %s", type);
-                g_debug ("Launching '%s'\n", cmdline);
-
-                error = NULL;
-                if (!g_spawn_command_line_async (cmdline, &error)) {
-                        g_warning ("Failed to launch nm-connection-editor: %s", error->message);
-                        g_error_free (error);
-                }
-                g_free (cmdline);
-                g_free (type);
-        }
+        NetConnectionEditor *editor;
+        GtkWindow *toplevel;
+
+        toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (panel)));
+        editor = net_connection_editor_new (toplevel, NULL, NULL, NULL,
+                                            panel->priv->client);
+        g_signal_connect (editor, "done", G_CALLBACK (editor_done), panel);
+        net_connection_editor_run (editor);
 }
 
 static void
@@ -994,131 +1291,38 @@
 
         /* delete the object */
         net_object_delete (object);
+        g_object_unref (object);
 }
 
 static void
 on_toplevel_map (GtkWidget      *widget,
                  CcNetworkPanel *panel)
 {
-        gboolean ret;
-
         /* is the user compiling against a new version, but not running
          * the daemon? */
-        ret = panel_check_network_manager_version (panel);
-        if (ret) {
-                manager_running (panel->priv->client, NULL, panel);
-        } else {
-                /* just select the proxy settings */
-                select_first_device (panel);
-        }
-}
-
-static void
-rfkill_changed (CcRfkillGlib     *rfkill,
-		GList          *events,
-		CcNetworkPanel *panel)
-{
-	gboolean enabled;
-	GList *l;
-	GHashTableIter iter;
-	gpointer key, value;
-
-	enabled = TRUE;
-
-	for (l = events; l != NULL; l = l->next) {
-		struct rfkill_event *event = l->data;
-
-		if (event->op == RFKILL_OP_ADD)
-			g_hash_table_insert (panel->priv->killswitches,
-					     GINT_TO_POINTER (event->idx),
-					     GINT_TO_POINTER (event->soft || event->hard));
-		else if (event->op == RFKILL_OP_CHANGE)
-			g_hash_table_insert (panel->priv->killswitches,
-					     GINT_TO_POINTER (event->idx),
-					     GINT_TO_POINTER (event->soft || event->hard));
-		else if (event->op == RFKILL_OP_DEL)
-			g_hash_table_remove (panel->priv->killswitches,
-					     GINT_TO_POINTER (event->idx));
-	}
-
-	g_hash_table_iter_init (&iter, panel->priv->killswitches);
-	while (g_hash_table_iter_next (&iter, &key, &value)) {
-		int idx, state;
-
-		idx = GPOINTER_TO_INT (key);
-		state = GPOINTER_TO_INT (value);
-		g_debug ("Killswitch %d is %s", idx, state ? "enabled" : "disabled");
-
-		/* A single device that's enabled? airplane mode is off */
-		if (state == FALSE) {
-			enabled = FALSE;
-			break;
-		}
-	}
-
-	if (enabled != gtk_switch_get_active (panel->priv->rfkill_switch)) {
-		g_signal_handlers_block_by_func (panel->priv->rfkill_switch,
-						 cc_network_panel_notify_enable_active_cb,
-						 panel);
-		gtk_switch_set_active (panel->priv->rfkill_switch, enabled);
-		g_signal_handlers_unblock_by_func (panel->priv->rfkill_switch,
-						 cc_network_panel_notify_enable_active_cb,
-						 panel);
-	}
-}
-
-static gboolean
-network_add_shell_header_widgets_cb (gpointer user_data)
-{
-        CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
-        GtkWidget *box;
-        GtkWidget *label;
-        GtkWidget *widget;
-
-        box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-        /* TRANSLATORS: this is to disable the radio hardware in the
-         * network panel */
-        label = gtk_label_new_with_mnemonic (_("Air_plane Mode"));
-        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
-        gtk_widget_set_visible (label, TRUE);
-        widget = gtk_switch_new ();
-        gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-        gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0);
-        gtk_widget_show_all (box);
-        panel->priv->rfkill_switch = GTK_SWITCH (widget);
-        cc_shell_embed_widget_in_header (cc_panel_get_shell (CC_PANEL (panel)), box);
-        panel->priv->kill_switch_header = g_object_ref (box);
-
-        panel->priv->killswitches = g_hash_table_new (g_direct_hash, g_direct_equal);
-        panel->priv->rfkill = cc_rfkill_glib_new ();
-        g_signal_connect (G_OBJECT (panel->priv->rfkill), "changed",
-                          G_CALLBACK (rfkill_changed), panel);
-        if (cc_rfkill_glib_open (panel->priv->rfkill) < 0)
-                gtk_widget_hide (box);
-
-        g_signal_connect (panel->priv->rfkill_switch, "notify::active",
-                          G_CALLBACK (cc_network_panel_notify_enable_active_cb),
-                          panel);
-
-        return FALSE;
+        panel_check_network_manager_version (panel);
 }
 
 static void
 cc_network_panel_init (CcNetworkPanel *panel)
 {
-        DBusGConnection *bus = NULL;
         GError *error = NULL;
         GtkStyleContext *context;
         GtkTreeSelection *selection;
         GtkWidget *widget;
         GtkWidget *toplevel;
+        GDBusConnection *system_bus;
+        GtkCssProvider *provider;
+        const GPtrArray *connections;
+        guint i;
 
         panel->priv = NETWORK_PANEL_PRIVATE (panel);
+        g_resources_register (cc_network_get_resource ());
 
         panel->priv->builder = gtk_builder_new ();
-        gtk_builder_add_from_file (panel->priv->builder,
-                                   GNOMECC_UI_DIR "/network.ui",
-                                   &error);
+        gtk_builder_add_from_resource (panel->priv->builder,
+                                       "/org/gnome/control-center/network/network.ui",
+                                       &error);
         if (error != NULL) {
                 g_warning ("Could not load interface file: %s", error->message);
                 g_error_free (error);
@@ -1150,16 +1354,35 @@
         panel_add_proxy_device (panel);
 
         /* use NetworkManager client */
-        panel->priv->client = nm_client_new ();
-        g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_MANAGER_RUNNING,
+        panel->priv->client = nm_client_new (NULL, NULL);
+        g_signal_connect (panel->priv->client, "notify::nm-running" ,
                           G_CALLBACK (manager_running), panel);
-        g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_ACTIVE_CONNECTIONS,
+        g_signal_connect (panel->priv->client, "notify::active-connections",
                           G_CALLBACK (active_connections_changed), panel);
         g_signal_connect (panel->priv->client, "device-added",
                           G_CALLBACK (device_added_cb), panel);
         g_signal_connect (panel->priv->client, "device-removed",
                           G_CALLBACK (device_removed_cb), panel);
 
+        /* Setup ModemManager client */
+        system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+        if (system_bus == NULL) {
+                g_warning ("Error connecting to system D-Bus: %s",
+                           error->message);
+                g_clear_error (&error);
+        } else {
+                panel->priv->modem_manager = mm_manager_new_sync (system_bus,
+                                                                  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+                                                                  NULL,
+                                                                  &error);
+                if (panel->priv->modem_manager == NULL) {
+                        g_warning ("Error connecting to ModemManager: %s",
+                                   error->message);
+                        g_clear_error (&error);
+                }
+                g_object_unref (system_bus);
+        }
+
         widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
                                                      "add_toolbutton"));
         g_signal_connect (widget, "clicked",
@@ -1172,17 +1395,8 @@
                           G_CALLBACK (remove_connection), panel);
 
         /* add remote settings such as VPN settings as virtual devices */
-        bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-        if (bus == NULL) {
-                g_warning ("Error connecting to system D-Bus: %s",
-                           error->message);
-                g_error_free (error);
-        }
-        panel->priv->remote_settings = nm_remote_settings_new (bus);
-        g_signal_connect (panel->priv->remote_settings, NM_REMOTE_SETTINGS_CONNECTIONS_READ,
-                          G_CALLBACK (notify_connections_read_cb), panel);
-        g_signal_connect (panel->priv->remote_settings, NM_REMOTE_SETTINGS_NEW_CONNECTION,
-                          G_CALLBACK (notify_new_connection_cb), panel);
+        g_signal_connect (panel->priv->client, NM_CLIENT_CONNECTION_ADDED,
+                          G_CALLBACK (notify_connection_added_cb), panel);
 
         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (panel));
         g_signal_connect_after (toplevel, "map", G_CALLBACK (on_toplevel_map), panel);
@@ -1194,10 +1408,22 @@
 
         widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
                                                      "vbox1"));
-        gtk_widget_reparent (widget, (GtkWidget *) panel);
-
-        /* add kill switch widgets when dialog activated */
-        panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel);
+        gtk_container_add (GTK_CONTAINER (panel), widget);
+
+        provider = gtk_css_provider_new ();
+        gtk_css_provider_load_from_data (provider, ".circular-button { border-radius: 20px; -gtk-outline-radius: 20px; }", -1, NULL);
+        gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                                   GTK_STYLE_PROVIDER (provider),
+                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        g_object_unref (provider);
+        
+        /* Cold-plug existing connections */
+        connections = nm_client_get_connections (panel->priv->client);
+        for (i = 0; i < connections->len; i++)
+                add_connection (panel, connections->pdata[i]);
+
+        g_debug ("Calling handle_argv() after cold-plugging connections");
+        handle_argv (panel);
 }
 
 void

=== modified file 'panels/network/cc-network-panel.h'
--- panels/network/cc-network-panel.h	2011-11-07 18:03:14 +0000
+++ panels/network/cc-network-panel.h	2019-05-01 13:56:52 +0000
@@ -65,7 +65,9 @@
 
 GType cc_network_panel_get_type (void) G_GNUC_CONST;
 
-void  cc_network_panel_register (GIOModule *module);
+void cc_network_panel_register (GIOModule *module);
+
+GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
 
 G_END_DECLS
 

=== added directory 'panels/network/connection-editor'
=== added file 'panels/network/connection-editor/8021x-security-page.ui'
--- panels/network/connection-editor/8021x-security-page.ui	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/8021x-security-page.ui	2019-05-01 13:56:52 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkNotebook" id="page">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="show_tabs">False</property>
+    <property name="show_border">False</property>
+    <child>
+      <object class="GtkGrid" id="grid">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">50</property>
+        <property name="margin_end">50</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="row_spacing">10</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="heading_sec">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">802.1x _Security</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">8021x_switch</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="8021x_switch">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="vbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="tab">
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">page 1</property>
+      </object>
+      <packing>
+        <property name="tab_fill">False</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">50</property>
+        <property name="margin_end">50</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="row_spacing">10</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="entry1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+            <property name="width_chars">35</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry2">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry3">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry4">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry5">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry6">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry7">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">6</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry8">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">7</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry9">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">8</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry10">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">●</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">9</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Anony_mous identity</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Inner _authentication</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child type="tab">
+      <object class="GtkLabel" id="label2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">page 2</property>
+      </object>
+      <packing>
+        <property name="position">1</property>
+        <property name="tab_fill">False</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child type="tab">
+      <placeholder/>
+    </child>
+  </object>
+</interface>

=== added file 'panels/network/connection-editor/Makefile.am'
--- panels/network/connection-editor/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/Makefile.am	2019-05-01 13:56:52 +0000
@@ -0,0 +1,54 @@
+noinst_LTLIBRARIES = libconnection-editor.la
+
+BUILT_SOURCES =					\
+	net-connection-editor-resources.c	\
+	net-connection-editor-resources.h
+
+libconnection_editor_la_SOURCES = 		\
+	$(BUILT_SOURCES)			\
+	net-connection-editor.h			\
+	net-connection-editor.c			\
+	ce-page.h				\
+	ce-page.c				\
+	ce-page-details.h			\
+	ce-page-details.c			\
+	ce-page-wifi.h				\
+	ce-page-wifi.c				\
+	ce-page-ip4.h				\
+	ce-page-ip4.c				\
+	ce-page-ip6.h				\
+	ce-page-ip6.c				\
+	ce-page-security.h			\
+	ce-page-security.c			\
+	ce-page-ethernet.h			\
+	ce-page-ethernet.c			\
+	ce-page-8021x-security.h		\
+	ce-page-8021x-security.c		\
+	ce-page-vpn.h				\
+	ce-page-vpn.c				\
+	vpn-helpers.h				\
+	vpn-helpers.c				\
+	ui-helpers.h				\
+	ui-helpers.c
+
+libconnection_editor_la_CPPFLAGS = 		\
+	$(PANEL_CFLAGS)				\
+	-I$(srcdir)/../wireless-security	\
+	$(NETWORK_PANEL_CFLAGS) 		\
+        $(NETWORK_MANAGER_CFLAGS)
+
+libconnection_editor_la_LIBADD = 		\
+	$(builddir)/../wireless-security/libwireless-security.la \
+	$(NETWORK_PANEL_LIBS) 			\
+	$(NETWORK_MANAGER_LIBS)
+
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/connection-editor.gresource.xml)
+net-connection-editor-resources.c: connection-editor.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name net_connection_editor $<
+net-connection-editor-resources.h: connection-editor.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name net_connection_editor $<
+
+EXTRA_DIST = \
+	$(resource_files) connection-editor.gresource.xml
+
+-include $(top_srcdir)/git.mk

=== added file 'panels/network/connection-editor/ce-page-8021x-security.c'
--- panels/network/connection-editor/ce-page-8021x-security.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-8021x-security.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,186 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * Dan Williams <[e-mail]>
+ *
+ * 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.
+ *
+ * (C) Copyright 2008 - 2012 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include <NetworkManager.h>
+
+#include "wireless-security.h"
+#include "ce-page-ethernet.h"
+#include "ce-page-8021x-security.h"
+
+G_DEFINE_TYPE (CEPage8021xSecurity, ce_page_8021x_security, CE_TYPE_PAGE)
+
+static void
+enable_toggled (GObject *sw, GParamSpec *pspec, gpointer user_data)
+{
+	CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (user_data);
+
+	gtk_widget_set_sensitive (page->security_widget, gtk_switch_get_active (page->enabled));
+	ce_page_changed (CE_PAGE (page));
+}
+
+static void
+stuff_changed (WirelessSecurity *sec, gpointer user_data)
+{
+        ce_page_changed (CE_PAGE (user_data));
+}
+
+static void
+finish_setup (CEPage8021xSecurity *page, gpointer unused, GError *error, gpointer user_data)
+{
+	GtkWidget *parent;
+        GtkWidget *vbox;
+        GtkWidget *heading;
+
+	if (error)
+		return;
+
+        vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox"));
+        heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec"));
+
+        page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+	page->security = (WirelessSecurity *) ws_wpa_eap_new (CE_PAGE (page)->connection, TRUE, FALSE);
+	if (!page->security) {
+		g_warning ("Could not load 802.1x user interface.");
+		return;
+	}
+
+	wireless_security_set_changed_notify (page->security, stuff_changed, page);
+	page->security_widget = wireless_security_get_widget (page->security);
+	parent = gtk_widget_get_parent (page->security_widget);
+	if (parent)
+		gtk_container_remove (GTK_CONTAINER (parent), page->security_widget);
+
+	gtk_switch_set_active (page->enabled, page->initial_have_8021x);
+	g_signal_connect (page->enabled, "notify::active", G_CALLBACK (enable_toggled), page);
+	gtk_widget_set_sensitive (page->security_widget, page->initial_have_8021x);
+
+        gtk_size_group_add_widget (page->group, heading);
+        wireless_security_add_to_size_group (page->security, page->group);
+
+	gtk_container_add (GTK_CONTAINER (vbox), page->security_widget);
+
+}
+
+CEPage *
+ce_page_8021x_security_new (NMConnection     *connection,
+                            NMClient         *client)
+{
+	CEPage8021xSecurity *page;
+
+	page = CE_PAGE_8021X_SECURITY (ce_page_new (CE_TYPE_PAGE_8021X_SECURITY,
+	                                            connection,
+	                                            client,
+	                                            "/org/gnome/control-center/network/8021x-security-page.ui",
+	                                            _("Security")));
+
+	if (nm_connection_get_setting_802_1x (connection))
+		page->initial_have_8021x = TRUE;
+
+	page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "8021x_switch"));
+
+	g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL);
+
+	if (page->initial_have_8021x)
+                CE_PAGE (page)->security_setting = NM_SETTING_802_1X_SETTING_NAME;
+
+	return CE_PAGE (page);
+}
+
+static gboolean
+validate (CEPage *cepage, NMConnection *connection, GError **error)
+{
+	CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (cepage);
+	gboolean valid = TRUE;
+
+	if (gtk_switch_get_active (page->enabled)) {
+		NMConnection *tmp_connection;
+		NMSetting *s_8021x;
+
+		/* FIXME: get failed property and error out of wireless security objects */
+		valid = wireless_security_validate (page->security, error);
+		if (valid) {
+			NMSetting *s_con;
+
+			/* Here's a nice hack to work around the fact that ws_802_1x_fill_connection needs wireless setting. */
+			tmp_connection = nm_simple_connection_new ();
+			nm_connection_add_setting (tmp_connection, nm_setting_wireless_new ());
+
+			/* temp connection needs a 'connection' setting too, since most of
+			 * the EAP methods need the UUID for CA cert ignore stuff.
+			 */
+			s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+			nm_connection_add_setting (tmp_connection, nm_setting_duplicate (s_con));
+
+			ws_802_1x_fill_connection (page->security, "wpa_eap_auth_combo", tmp_connection);
+
+			s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
+			nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
+
+			g_object_unref (tmp_connection);
+		}
+	} else {
+		nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
+		valid = TRUE;
+	}
+
+	return valid;
+}
+
+static void
+ce_page_8021x_security_init (CEPage8021xSecurity *page)
+{
+}
+
+static void
+dispose (GObject *object)
+{
+	CEPage8021xSecurity *page = CE_PAGE_8021X_SECURITY (object);
+
+	if (page->security) {
+		wireless_security_unref (page->security);
+                page->security = NULL;
+        }
+
+        g_clear_object (&page->group);
+
+	G_OBJECT_CLASS (ce_page_8021x_security_parent_class)->dispose (object);
+}
+
+static void
+ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (security_class);
+	CEPageClass *parent_class = CE_PAGE_CLASS (security_class);
+
+	/* virtual methods */
+	object_class->dispose = dispose;
+
+	parent_class->validate = validate;
+}

=== added file 'panels/network/connection-editor/ce-page-8021x-security.h'
--- panels/network/connection-editor/ce-page-8021x-security.h	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-8021x-security.h	2019-05-01 13:56:52 +0000
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * Dan Williams <[e-mail]>
+ *
+ * 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.
+ *
+ * (C) Copyright 2008 - 2012 Red Hat, Inc.
+ */
+
+#ifndef __CE_PAGE_8021X_SECURITY_H
+#define __CE_PAGE_8021X_SECURITY_H
+
+#include <NetworkManager.h>
+#include "wireless-security.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "ce-page.h"
+
+#define CE_TYPE_PAGE_8021X_SECURITY            (ce_page_8021x_security_get_type ())
+#define CE_PAGE_8021X_SECURITY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CE_TYPE_PAGE_8021X_SECURITY, CEPage8021xSecurity))
+#define CE_PAGE_8021X_SECURITY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CE_TYPE_PAGE_8021X_SECURITY, CEPage8021xSecurityClass))
+#define CE_IS_PAGE_8021X_SECURITY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CE_TYPE_PAGE_8021X_SECURITY))
+#define CE_IS_PAGE_8021X_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CE_TYPE_PAGE_8021X_SECURITY))
+#define CE_PAGE_8021X_SECURITY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CE_TYPE_PAGE_8021X_SECURITY, CEPage8021xSecurityClass))
+
+typedef struct CEPage8021xSecurity      CEPage8021xSecurity;
+typedef struct CEPage8021xSecurityClass CEPage8021xSecurityClass;
+
+struct CEPage8021xSecurity {
+	CEPage parent;
+
+        GtkSwitch *enabled;
+        GtkWidget *security_widget;
+        WirelessSecurity *security;
+        GtkSizeGroup *group;
+        gboolean initial_have_8021x;
+};
+
+struct CEPage8021xSecurityClass {
+	CEPageClass parent;
+};
+
+GType ce_page_8021x_security_get_type (void);
+
+CEPage *ce_page_8021x_security_new (NMConnection     *connection,
+                                    NMClient         *client);
+
+#endif  /* __CE_PAGE_8021X_SECURITY_H */

=== added file 'panels/network/connection-editor/ce-page-details.c'
--- panels/network/connection-editor/ce-page-details.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-details.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,289 @@
+/* -*- 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 <glib-object.h>
+#include <glib/gi18n.h>
+
+#include <NetworkManager.h>
+
+#include "../panel-common.h"
+#include "ce-page-details.h"
+
+G_DEFINE_TYPE (CEPageDetails, ce_page_details, CE_TYPE_PAGE)
+
+static void
+forget_cb (GtkButton *button, CEPageDetails *page)
+{
+        net_connection_editor_forget (page->editor);
+}
+
+static gchar *
+get_ap_security_string (NMAccessPoint *ap)
+{
+        NM80211ApSecurityFlags wpa_flags, rsn_flags;
+        NM80211ApFlags flags;
+        GString *str;
+
+        flags = nm_access_point_get_flags (ap);
+        wpa_flags = nm_access_point_get_wpa_flags (ap);
+        rsn_flags = nm_access_point_get_rsn_flags (ap);
+
+        str = g_string_new ("");
+        if ((flags & NM_802_11_AP_FLAGS_PRIVACY) &&
+            (wpa_flags == NM_802_11_AP_SEC_NONE) &&
+            (rsn_flags == NM_802_11_AP_SEC_NONE)) {
+                /* TRANSLATORS: this WEP WiFi security */
+                g_string_append_printf (str, "%s, ", _("WEP"));
+        }
+        if (wpa_flags != NM_802_11_AP_SEC_NONE) {
+                /* TRANSLATORS: this WPA WiFi security */
+                g_string_append_printf (str, "%s, ", _("WPA"));
+        }
+        if (rsn_flags != NM_802_11_AP_SEC_NONE) {
+                /* TRANSLATORS: this WPA WiFi security */
+                g_string_append_printf (str, "%s, ", _("WPA2"));
+        }
+        if ((wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) ||
+            (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
+                /* TRANSLATORS: this Enterprise WiFi security */
+                g_string_append_printf (str, "%s, ", _("Enterprise"));
+        }
+        if (str->len > 0)
+                g_string_set_size (str, str->len - 2);
+        else {
+                g_string_append (str, C_("Wifi security", "None"));
+        }
+        return g_string_free (str, FALSE);
+}
+
+static void
+update_last_used (CEPageDetails *page, NMConnection *connection)
+{
+        gchar *last_used = NULL;
+        GDateTime *now = NULL;
+        GDateTime *then = NULL;
+        gint days;
+        GTimeSpan diff;
+        guint64 timestamp;
+        NMSettingConnection *s_con;
+
+        s_con = nm_connection_get_setting_connection (connection);
+        if (s_con == NULL)
+                goto out;
+        timestamp = nm_setting_connection_get_timestamp (s_con);
+        if (timestamp == 0) {
+                last_used = g_strdup (_("Never"));
+                goto out;
+        }
+
+        /* calculate the amount of time that has elapsed */
+        now = g_date_time_new_now_utc ();
+        then = g_date_time_new_from_unix_utc (timestamp);
+
+        diff = g_date_time_difference  (now, then);
+        days = diff / G_TIME_SPAN_DAY;
+        if (days == 0)
+                last_used = g_strdup (_("Today"));
+        else if (days == 1)
+                last_used = g_strdup (_("Yesterday"));
+        else
+                last_used = g_strdup_printf (ngettext ("%i day ago", "%i days ago", days), days);
+out:
+        panel_set_device_widget_details (CE_PAGE (page)->builder, "last_used", last_used);
+        if (now != NULL)
+                g_date_time_unref (now);
+        if (then != NULL)
+                g_date_time_unref (then);
+        g_free (last_used);
+}
+
+static void
+all_user_changed (GtkToggleButton *b, CEPageDetails *page)
+{
+        gboolean all_users;
+        NMSettingConnection *sc;
+
+        sc = nm_connection_get_setting_connection (CE_PAGE (page)->connection);
+        all_users = gtk_toggle_button_get_active (b);
+
+        g_object_set (sc, "permissions", NULL, NULL);
+        if (!all_users)
+                nm_setting_connection_add_permission (sc, "user", g_get_user_name (), NULL);
+}
+
+static void
+connect_details_page (CEPageDetails *page)
+{
+        NMSettingConnection *sc;
+        GtkWidget *widget;
+        guint speed;
+        guint strength;
+        NMDeviceState state;
+        NMAccessPoint *active_ap;
+        const gchar *str;
+        const gchar *type;
+        gboolean device_is_active;
+
+        if (NM_IS_DEVICE_WIFI (page->device))
+                active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (page->device));
+        else
+                active_ap = NULL;
+
+        state = page->device ? nm_device_get_state (page->device) : NM_DEVICE_STATE_DISCONNECTED;
+
+        device_is_active = FALSE;
+        speed = 0;
+        if (active_ap && page->ap == active_ap && state != NM_DEVICE_STATE_UNAVAILABLE) {
+                device_is_active = TRUE;
+                if (NM_IS_DEVICE_WIFI (page->device))
+                        speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (page->device)) / 1000;
+        } else if (page->device) {
+                NMActiveConnection *ac;
+                const gchar *p1, *p2;
+
+                ac = nm_device_get_active_connection (page->device);
+                p1 = ac ? nm_active_connection_get_uuid (ac) : NULL;
+                p2 = nm_connection_get_uuid (CE_PAGE (page)->connection);
+                if (g_strcmp0 (p1, p2) == 0) {
+                        device_is_active = TRUE;
+                        if (NM_IS_DEVICE_WIFI (page->device))
+                                speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (page->device)) / 1000;
+                        else if (NM_IS_DEVICE_ETHERNET (page->device))
+                                speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (page->device));
+                }
+        }
+        if (speed > 0)
+                str = g_strdup_printf (_("%d Mb/s"), speed);
+        else
+                str = NULL;
+        panel_set_device_widget_details (CE_PAGE (page)->builder, "speed", str);
+        g_clear_pointer (&str, g_free);
+
+        if (NM_IS_DEVICE_WIFI (page->device))
+                str = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (page->device));
+        else if (NM_IS_DEVICE_ETHERNET (page->device))
+                str = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (page->device));
+
+        panel_set_device_widget_details (CE_PAGE (page)->builder, "mac", str);
+
+        str = NULL;
+        if (device_is_active && active_ap)
+                str = get_ap_security_string (active_ap);
+        panel_set_device_widget_details (CE_PAGE (page)->builder, "security", str);
+        g_clear_pointer (&str, g_free);
+
+        strength = 0;
+        if (page->ap != NULL)
+                strength = nm_access_point_get_strength (page->ap);
+
+        if (strength <= 0)
+                str = NULL;
+        else if (strength < 20)
+                str = C_("Signal strength", "None");
+        else if (strength < 40)
+                str = C_("Signal strength", "Weak");
+        else if (strength < 50)
+                str = C_("Signal strength", "Ok");
+        else if (strength < 80)
+                str = C_("Signal strength", "Good");
+        else
+                str = C_("Signal strength", "Excellent");
+        panel_set_device_widget_details (CE_PAGE (page)->builder, "strength", str);
+
+        /* set IP entries */
+        if (device_is_active)
+                panel_set_device_widgets (CE_PAGE (page)->builder, page->device);
+        else
+                panel_unset_device_widgets (CE_PAGE (page)->builder);
+
+        if (!device_is_active && CE_PAGE (page)->connection)
+                update_last_used (page, CE_PAGE (page)->connection);
+        else
+                panel_set_device_widget_details (CE_PAGE (page)->builder, "last_used", NULL);
+
+        /* Auto connect check */
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
+                                                     "auto_connect_check"));
+        sc = nm_connection_get_setting_connection (CE_PAGE (page)->connection);
+        g_object_bind_property (sc, "autoconnect",
+                                widget, "active",
+                                G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+        g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ce_page_changed), page);
+
+        /* All users check */
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
+                                                     "all_user_check"));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
+                                      nm_setting_connection_get_num_permissions (sc) == 0);
+        g_signal_connect (widget, "toggled",
+                          G_CALLBACK (all_user_changed), page);
+        g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ce_page_changed), page);
+
+        /* Forget button */
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "button_forget"));
+        g_signal_connect (widget, "clicked", G_CALLBACK (forget_cb), page);
+
+        type = nm_setting_connection_get_connection_type (sc);
+        if (g_str_equal (type, NM_SETTING_WIRELESS_SETTING_NAME))
+                gtk_button_set_label (GTK_BUTTON (widget), _("Forget Connection"));
+        else if (g_str_equal (type, NM_SETTING_WIRED_SETTING_NAME))
+                gtk_button_set_label (GTK_BUTTON (widget), _("Remove Connection Profile"));
+        else if (g_str_equal (type, NM_SETTING_VPN_SETTING_NAME))
+                gtk_button_set_label (GTK_BUTTON (widget), _("Remove VPN"));
+        else
+                gtk_widget_hide (widget);
+}
+
+static void
+ce_page_details_init (CEPageDetails *page)
+{
+}
+
+static void
+ce_page_details_class_init (CEPageDetailsClass *class)
+{
+}
+
+CEPage *
+ce_page_details_new (NMConnection        *connection,
+                     NMClient            *client,
+                     NMDevice            *device,
+                     NMAccessPoint       *ap,
+                     NetConnectionEditor *editor)
+{
+        CEPageDetails *page;
+
+        page = CE_PAGE_DETAILS (ce_page_new (CE_TYPE_PAGE_DETAILS,
+                                             connection,
+                                             client,
+                                             "/org/gnome/control-center/network/details-page.ui",
+                                             _("Details")));
+
+        page->editor = editor;
+        page->device = device;
+        page->ap = ap;
+
+        connect_details_page (page);
+
+        return CE_PAGE (page);
+}

=== added file 'panels/network/connection-editor/ce-page-details.h'
--- panels/network/connection-editor/ce-page-details.h	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-details.h	2019-05-01 13:56:52 +0000
@@ -0,0 +1,68 @@
+/* -*- 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.
+ */
+
+#ifndef __CE_PAGE_DETAILS_H
+#define __CE_PAGE_DETAILS_H
+
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+#include "net-connection-editor.h"
+#include "ce-page.h"
+
+G_BEGIN_DECLS
+
+#define CE_TYPE_PAGE_DETAILS          (ce_page_details_get_type ())
+#define CE_PAGE_DETAILS(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), CE_TYPE_PAGE_DETAILS, CEPageDetails))
+#define CE_PAGE_DETAILS_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), CE_TYPE_PAGE_DETAILS, CEPageDetailsClass))
+#define CE_IS_PAGE_DETAILS(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), CE_TYPE_PAGE_DETAILS))
+#define CE_IS_PAGE_DETAILS_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), CE_TYPE_PAGE_DETAILS))
+#define CE_PAGE_DETAILS_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), CE_TYPE_PAGE_DETAILS, CEPageDetailsClass))
+
+typedef struct _CEPageDetails          CEPageDetails;
+typedef struct _CEPageDetailsClass     CEPageDetailsClass;
+
+struct _CEPageDetails
+{
+        CEPage parent;
+
+        NMDevice *device;
+        NMAccessPoint *ap;
+        NetConnectionEditor *editor;
+};
+
+struct _CEPageDetailsClass
+{
+        CEPageClass parent_class;
+};
+
+GType   ce_page_details_get_type (void);
+
+CEPage *ce_page_details_new      (NMConnection        *connection,
+                                  NMClient            *client,
+                                  NMDevice            *device,
+                                  NMAccessPoint       *ap,
+                                  NetConnectionEditor *editor);
+
+G_END_DECLS
+
+#endif /* __CE_PAGE_DETAILS_H */
+

=== added file 'panels/network/connection-editor/ce-page-ethernet.c'
--- panels/network/connection-editor/ce-page-ethernet.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ethernet.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,187 @@
+/* -*- 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 <glib-object.h>
+#include <glib/gi18n.h>
+#include <net/if_arp.h>
+
+#include <NetworkManager.h>
+
+
+#include "ce-page-ethernet.h"
+#include "ui-helpers.h"
+
+G_DEFINE_TYPE (CEPageEthernet, ce_page_ethernet, CE_TYPE_PAGE)
+
+static void
+mtu_changed (GtkSpinButton *mtu, CEPageEthernet *page)
+{
+        if (gtk_spin_button_get_value_as_int (mtu) == 0)
+                gtk_widget_hide (page->mtu_label);
+        else
+                gtk_widget_show (page->mtu_label);
+}
+
+static void
+connect_ethernet_page (CEPageEthernet *page)
+{
+        NMSettingWired *setting = page->setting_wired;
+        int mtu_def;
+        char **mac_list;
+        const char *s_mac_str;
+        const gchar *name;
+        const gchar *cloned_mac;
+
+        name = nm_setting_connection_get_id (page->setting_connection);
+        gtk_entry_set_text (page->name, name);
+
+        /* Device MAC address */
+        mac_list = ce_page_get_mac_list (CE_PAGE (page)->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 (page->device_mac, s_mac_str, mac_list);
+        g_strfreev (mac_list);
+        g_signal_connect_swapped (page->device_mac, "changed", G_CALLBACK (ce_page_changed), page);
+
+        /* Cloned MAC address */
+        cloned_mac = nm_setting_wired_get_cloned_mac_address (setting);
+        gtk_entry_set_text (GTK_ENTRY (page->cloned_mac), cloned_mac ? cloned_mac : "");
+        g_signal_connect_swapped (page->cloned_mac, "changed", G_CALLBACK (ce_page_changed), page);
+
+        /* MTU */
+        mtu_def = ce_get_property_default (NM_SETTING (setting), NM_SETTING_WIRED_MTU);
+        g_signal_connect (page->mtu, "output",
+                          G_CALLBACK (ce_spin_output_with_default),
+                          GINT_TO_POINTER (mtu_def));
+        gtk_spin_button_set_value (page->mtu, (gdouble) nm_setting_wired_get_mtu (setting));
+        g_signal_connect (page->mtu, "value-changed",
+                          G_CALLBACK (mtu_changed), page);
+        mtu_changed (page->mtu, page);
+
+        g_signal_connect_swapped (page->name, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (page->mtu, "value-changed", G_CALLBACK (ce_page_changed), page);
+}
+
+static void
+ui_to_setting (CEPageEthernet *page)
+{
+        gchar *device_mac = NULL;
+        gchar *cloned_mac;
+        const gchar *text;
+        GtkWidget *entry;
+
+        entry = gtk_bin_get_child (GTK_BIN (page->device_mac));
+        if (entry) {
+                text = gtk_entry_get_text (GTK_ENTRY (entry));
+                device_mac = ce_page_trim_address (text);
+        }
+        text = gtk_entry_get_text (GTK_ENTRY (entry));
+        cloned_mac = ce_page_trim_address (text);
+
+        g_object_set (page->setting_wired,
+                      NM_SETTING_WIRED_MAC_ADDRESS, device_mac,
+                      NM_SETTING_WIRED_CLONED_MAC_ADDRESS, cloned_mac,
+                      NM_SETTING_WIRED_MTU, (guint32) gtk_spin_button_get_value_as_int (page->mtu),
+                      NULL);
+
+        g_object_set (page->setting_connection,
+                      NM_SETTING_CONNECTION_ID, gtk_entry_get_text (page->name),
+                      NULL);
+
+        g_free (cloned_mac);
+        g_free (device_mac);
+}
+
+static gboolean
+validate (CEPage        *page,
+          NMConnection  *connection,
+          GError       **error)
+{
+        CEPageEthernet *self = CE_PAGE_ETHERNET (page);
+        GtkWidget *entry;
+        gboolean ret = TRUE;
+
+        entry = gtk_bin_get_child (GTK_BIN (self->device_mac));
+        if (entry) {
+                if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) {
+                        widget_set_error (entry);
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (entry);
+                }
+        }
+
+        if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (self->cloned_mac)))) {
+                widget_set_error (GTK_WIDGET (self->cloned_mac));
+                ret = FALSE;
+        } else {
+                widget_unset_error (GTK_WIDGET (self->cloned_mac));
+        }
+
+        if (!ret)
+                return ret;
+
+        ui_to_setting (self);
+
+        return nm_setting_verify (NM_SETTING (self->setting_connection), NULL, error) &&
+               nm_setting_verify (NM_SETTING (self->setting_wired), NULL, error);
+}
+
+static void
+ce_page_ethernet_init (CEPageEthernet *page)
+{
+}
+
+static void
+ce_page_ethernet_class_init (CEPageEthernetClass *class)
+{
+        CEPageClass *page_class= CE_PAGE_CLASS (class);
+
+        page_class->validate = validate;
+}
+
+CEPage *
+ce_page_ethernet_new (NMConnection     *connection,
+                      NMClient         *client)
+{
+        CEPageEthernet *page;
+
+        page = CE_PAGE_ETHERNET (ce_page_new (CE_TYPE_PAGE_ETHERNET,
+                                              connection,
+                                              client,
+                                              "/org/gnome/control-center/network/ethernet-page.ui",
+                                              _("Identity")));
+
+        page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_name"));
+        page->device_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_mac"));
+        page->cloned_mac = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_cloned_mac"));
+        page->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "spin_mtu"));
+        page->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_mtu"));
+
+        page->setting_connection = nm_connection_get_setting_connection (connection);
+        page->setting_wired = nm_connection_get_setting_wired (connection);
+
+        connect_ethernet_page (page);
+
+        return CE_PAGE (page);
+}

=== added file 'panels/network/connection-editor/ce-page-ethernet.h'
--- panels/network/connection-editor/ce-page-ethernet.h	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ethernet.h	2019-05-01 13:56:52 +0000
@@ -0,0 +1,71 @@
+/* -*- 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 ethernet.
+ *
+ * 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.
+ */
+
+#ifndef __CE_PAGE_ETHERNET_H
+#define __CE_PAGE_ETHERNET_H
+
+#include <glib-object.h>
+
+#include <NetworkManager.h>
+
+#include <gtk/gtk.h>
+#include "ce-page.h"
+
+G_BEGIN_DECLS
+
+#define CE_TYPE_PAGE_ETHERNET          (ce_page_ethernet_get_type ())
+#define CE_PAGE_ETHERNET(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), CE_TYPE_PAGE_ETHERNET, CEPageEthernet))
+#define CE_PAGE_ETHERNET_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), CE_TYPE_PAGE_ETHERNET, CEPageEthernetClass))
+#define CE_IS_PAGE_ETHERNET(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), CE_TYPE_PAGE_ETHERNET))
+#define CE_IS_PAGE_ETHERNET_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), CE_TYPE_PAGE_ETHERNET))
+#define CE_PAGE_ETHERNET_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), CE_TYPE_PAGE_ETHERNET, CEPageEthernetClass))
+
+typedef struct _CEPageEthernet          CEPageEthernet;
+typedef struct _CEPageEthernetClass     CEPageEthernetClass;
+
+struct _CEPageEthernet
+{
+        CEPage parent;
+
+        NMSettingConnection *setting_connection;
+        NMSettingWired *setting_wired;
+
+        GtkEntry        *name;
+        GtkComboBoxText *device_mac;
+        GtkEntry        *cloned_mac;
+        GtkSpinButton   *mtu;
+        GtkWidget       *mtu_label;
+};
+
+struct _CEPageEthernetClass
+{
+        CEPageClass parent_class;
+};
+
+GType   ce_page_ethernet_get_type (void);
+
+CEPage *ce_page_ethernet_new      (NMConnection     *connection,
+                                   NMClient         *client);
+
+G_END_DECLS
+
+#endif /* __CE_PAGE_ETHERNET_H */
+

=== added file 'panels/network/connection-editor/ce-page-ip4.c'
--- panels/network/connection-editor/ce-page-ip4.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ip4.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,907 @@
+/* -*- 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-object.h>
+#include <glib/gi18n.h>
+#include <NetworkManager.h>
+
+#include "shell/list-box-helper.h"
+#include "ce-page-ip4.h"
+#include "ui-helpers.h"
+
+#define RADIO_IS_ACTIVE(x) (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(CE_PAGE (page)->builder, x))))
+
+static void ensure_empty_address_row (CEPageIP4 *page);
+static void ensure_empty_routes_row (CEPageIP4 *page);
+
+G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE)
+
+enum {
+        METHOD_COL_NAME,
+        METHOD_COL_METHOD
+};
+
+enum {
+        IP4_METHOD_AUTO,
+        IP4_METHOD_MANUAL,
+        IP4_METHOD_LINK_LOCAL,
+        IP4_METHOD_SHARED,
+        IP4_METHOD_DISABLED
+};
+
+static void
+method_changed (GtkToggleButton *radio, CEPageIP4 *page)
+{
+        gboolean addr_enabled;
+        gboolean dns_enabled;
+        gboolean routes_enabled;
+        GtkWidget *widget;
+
+        if (RADIO_IS_ACTIVE ("radio_disabled")) {
+                addr_enabled = FALSE;
+                dns_enabled = FALSE;
+                routes_enabled = FALSE;
+        } else {
+                addr_enabled = RADIO_IS_ACTIVE ("radio_manual");
+                dns_enabled = !RADIO_IS_ACTIVE ("radio_local");
+                routes_enabled = !RADIO_IS_ACTIVE ("radio_local");
+        }
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+        gtk_widget_set_visible (widget, addr_enabled);
+        gtk_widget_set_sensitive (page->dns_entry, dns_enabled);
+        gtk_widget_set_sensitive (page->routes_list, routes_enabled);
+        gtk_widget_set_sensitive (page->never_default, routes_enabled);
+
+        ce_page_changed (CE_PAGE (page));
+}
+
+static void
+switch_toggled (GObject    *object,
+                GParamSpec *pspec,
+                CEPage     *page)
+{
+        ce_page_changed (page);
+}
+
+static void
+update_row_sensitivity (CEPageIP4 *page, 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
+update_row_gateway_sensitivity (CEPageIP4 *page)
+{
+        GList *children, *l;
+        gint rows = 0;
+
+        children = gtk_container_get_children (GTK_CONTAINER (page->address_list));
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkWidget *entry;
+
+                entry = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway"));
+
+                gtk_widget_set_sensitive (entry, (rows == 0));
+
+                rows++;
+        }
+        g_list_free (children);
+}
+
+static void
+remove_row (GtkButton *button, CEPageIP4 *page)
+{
+        GtkWidget *list;
+        GtkWidget *row;
+        GtkWidget *row_box;
+
+        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 (page));
+
+        update_row_sensitivity (page, list);
+        if (list == page->address_list)
+                update_row_gateway_sensitivity (page);
+}
+
+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 gint
+sort_first_last (gconstpointer a, gconstpointer b, gpointer data)
+{
+        gboolean afirst, bfirst, alast, blast;
+
+        afirst = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "first"));
+        bfirst = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "first"));
+        alast = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "last"));
+        blast = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "last"));
+
+        if (afirst)
+                return -1;
+        if (bfirst)
+                return 1;
+        if (alast)
+                return 1;
+        if (blast)
+                return -1;
+
+        return 0;
+}
+
+static void
+add_address_row (CEPageIP4   *page,
+                 const gchar *address,
+                 const gchar *network,
+                 const gchar *gateway)
+{
+        GtkSizeGroup *group;
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        g_object_set_data (G_OBJECT (row), "network", 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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        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 (delete_button, "clicked", G_CALLBACK (remove_row), page);
+        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);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "address_sizegroup"));
+        gtk_size_group_add_widget (group, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (page->address_list), row);
+
+        update_row_gateway_sensitivity (page);
+        update_row_sensitivity (page, page->address_list);
+}
+
+static void
+ensure_empty_address_row (CEPageIP4 *page)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (page->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 (page, "", "", "");
+
+        g_list_free (children);
+}
+
+static void
+add_address_section (CEPageIP4 *page)
+{
+        GtkWidget *widget;
+        GtkWidget *list;
+        gint i;
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+
+        page->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_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (widget), list);
+
+        for (i = 0; i < nm_setting_ip_config_get_num_addresses (page->setting); i++) {
+                NMIPAddress *addr;
+                struct in_addr tmp_addr;
+                gchar network[INET_ADDRSTRLEN + 1];
+
+                addr = nm_setting_ip_config_get_address (page->setting, i);
+                if (!addr)
+                        continue;
+
+                tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip_address_get_prefix (addr));
+                (void) inet_ntop (AF_INET, &tmp_addr, &network[0], sizeof (network));
+
+                add_address_row (page,
+                                 nm_ip_address_get_address (addr),
+                                 network,
+                                 i == 0 ? nm_setting_ip_config_get_gateway (page->setting) : "");
+        }
+        if (nm_setting_ip_config_get_num_addresses (page->setting) == 0)
+                ensure_empty_address_row (page);
+
+        gtk_widget_show_all (widget);
+}
+
+static void
+add_dns_section (CEPageIP4 *page)
+{
+        GtkEntry *entry;
+        GString *string;
+        gint i;
+
+        page->auto_dns = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_dns_switch"));
+        gtk_switch_set_active (page->auto_dns, !nm_setting_ip_config_get_ignore_auto_dns (page->setting));
+        g_signal_connect (page->auto_dns, "notify::active", G_CALLBACK (switch_toggled), page);
+
+        page->dns_entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "dns_entry"));
+        entry = GTK_ENTRY (page->dns_entry);
+        string = g_string_new ("");
+
+        for (i = 0; i < nm_setting_ip_config_get_num_dns (page->setting); i++) {
+                const char *address;
+
+                address = nm_setting_ip_config_get_dns (page->setting, i);
+
+                if (i > 0)
+                        g_string_append (string, ", ");
+
+                g_string_append (string, address);
+        }
+
+        gtk_entry_set_text (entry, string->str);
+
+        g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (ce_page_changed), page);
+
+        g_string_free (string, TRUE);
+}
+
+static void
+add_route_row (CEPageIP4   *page,
+               const gchar *address,
+               const gchar *netmask,
+               const gchar *gateway,
+               gint         metric)
+{
+        GtkSizeGroup *group;
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        g_object_set_data (G_OBJECT (row), "netmask", widget);
+        gtk_entry_set_text (GTK_ENTRY (widget), netmask);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        g_object_set_data (G_OBJECT (row), "metric", widget);
+        if (metric >= 0) {
+                gchar *s = g_strdup_printf ("%d", metric);
+                gtk_entry_set_text (GTK_ENTRY (widget), s);
+                g_free (s);
+        }
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
+        gtk_widget_set_hexpand (widget, TRUE);
+        gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
+        delete_button = gtk_button_new ();
+        gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
+        g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page);
+        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);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (page->routes_list), row);
+
+        update_row_sensitivity (page, page->routes_list);
+}
+
+static void
+ensure_empty_routes_row (CEPageIP4 *page)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (page->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 (page, "", "", "", -1);
+
+        g_list_free (children);
+}
+
+static void
+add_routes_section (CEPageIP4 *page)
+{
+        GtkWidget *widget;
+        GtkWidget *list;
+        gint i;
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
+
+        page->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_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (widget), list);
+        page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_routes_switch"));
+        gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes (page->setting));
+        g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page);
+
+
+        for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) {
+                NMIPRoute *route;
+                struct in_addr tmp_addr;
+                gchar netmask[INET_ADDRSTRLEN + 1];
+
+                route = nm_setting_ip_config_get_route (page->setting, i);
+                if (!route)
+                        continue;
+
+                tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip_route_get_prefix (route));
+                (void) inet_ntop (AF_INET, &tmp_addr, &netmask[0], sizeof (netmask));
+
+                add_route_row (page,
+                               nm_ip_route_get_dest (route),
+                               netmask,
+                               nm_ip_route_get_next_hop (route),
+                               nm_ip_route_get_metric (route));
+        }
+        if (nm_setting_ip_config_get_num_routes (page->setting) == 0)
+                ensure_empty_routes_row (page);
+
+        gtk_widget_show_all (widget);
+}
+
+enum
+{
+        RADIO_AUTOMATIC,
+        RADIO_LOCAL,
+        RADIO_MANUAL,
+        RADIO_DISABLED,
+        N_RADIO
+};
+
+static void
+connect_ip4_page (CEPageIP4 *page)
+{
+        GtkToggleButton *radios[N_RADIO];
+        GtkWidget *content;
+        const gchar *str_method;
+        gboolean disabled;
+        guint method, i;
+
+        add_address_section (page);
+        add_dns_section (page);
+        add_routes_section (page);
+
+        page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_disabled"));
+
+        str_method = nm_setting_ip_config_get_method (page->setting);
+        disabled = g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0;
+        gtk_toggle_button_set_active (page->disabled, disabled);
+        g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page);
+        content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content"));
+        g_object_bind_property (page->disabled, "active",
+                                content, "sensitive",
+                                G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+        method = IP4_METHOD_AUTO;
+        if (g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL) == 0) {
+                method = IP4_METHOD_LINK_LOCAL;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) == 0) {
+                method = IP4_METHOD_MANUAL;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_SHARED) == 0) {
+                method = IP4_METHOD_SHARED;
+        } else if (g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0) {
+                method = IP4_METHOD_DISABLED;
+        }
+
+        page->never_default = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "never_default_check"));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->never_default),
+                                      nm_setting_ip_config_get_never_default (page->setting));
+        g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page);
+
+        /* Connect radio buttons */
+        radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_automatic"));
+        radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_local"));
+        radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_manual"));
+        radios[RADIO_DISABLED] = page->disabled;
+
+        for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++)
+                g_signal_connect (radios[i], "toggled", G_CALLBACK (method_changed), page);
+
+        switch (method) {
+        case IP4_METHOD_AUTO:
+                gtk_toggle_button_set_active (radios[RADIO_AUTOMATIC], TRUE);
+                break;
+        case IP4_METHOD_LINK_LOCAL:
+                gtk_toggle_button_set_active (radios[RADIO_LOCAL], TRUE);
+                break;
+        case IP4_METHOD_MANUAL:
+                gtk_toggle_button_set_active (radios[RADIO_MANUAL], TRUE);
+                break;
+        case IP4_METHOD_DISABLED:
+                gtk_toggle_button_set_active (radios[RADIO_DISABLED], TRUE);
+                break;
+        default:
+                break;
+        }
+
+        method_changed (NULL, page);
+}
+
+static gboolean
+parse_netmask (const char *str, guint32 *prefix)
+{
+        struct in_addr tmp_addr;
+        glong tmp_prefix;
+
+        errno = 0;
+
+        /* Is it a prefix? */
+        if (!strchr (str, '.')) {
+                tmp_prefix = strtol (str, NULL, 10);
+                if (!errno && tmp_prefix >= 0 && tmp_prefix <= 32) {
+                        *prefix = tmp_prefix;
+                        return TRUE;
+                }
+        }
+
+        /* Is it a netmask? */
+        if (inet_pton (AF_INET, str, &tmp_addr) > 0) {
+                *prefix = nm_utils_ip4_netmask_to_prefix (tmp_addr.s_addr);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static gboolean
+ui_to_setting (CEPageIP4 *page)
+{
+        const gchar *method;
+        gboolean ignore_auto_dns;
+        gboolean ignore_auto_routes;
+        gboolean never_default;
+        GPtrArray *addresses = NULL;
+        GPtrArray *dns_servers = NULL;
+        GPtrArray *routes = NULL;
+        GStrv dns_addresses = NULL;
+        GList *children, *l;
+        gboolean ret = TRUE;
+        const char *default_gateway = NULL;
+        gchar *dns_text = NULL;
+        guint i;
+
+        if (gtk_toggle_button_get_active (page->disabled)) {
+                method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
+        } else {
+                if (RADIO_IS_ACTIVE ("radio_automatic"))
+                        method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
+                else if (RADIO_IS_ACTIVE ("radio_local"))
+                        method = NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL;
+                else if (RADIO_IS_ACTIVE ("radio_manual"))
+                        method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
+        }
+
+        addresses = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref);
+        if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
+                children = gtk_container_get_children (GTK_CONTAINER (page->address_list));
+        else
+                children = NULL;
+
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkEntry *entry;
+                GtkEntry *gateway_entry;
+                const gchar *text_address;
+                const gchar *text_netmask;
+                const gchar *text_gateway = "";
+                NMIPAddress *addr;
+                guint32 prefix;
+
+                entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address"));
+                if (!entry)
+                        continue;
+
+                text_address = gtk_entry_get_text (entry);
+                text_netmask = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "network")));
+                gateway_entry = g_object_get_data (G_OBJECT (row), "gateway");
+                if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)))
+                        text_gateway = gtk_entry_get_text (gateway_entry);
+
+                if (!*text_address && !*text_netmask && !*text_gateway) {
+                        /* ignore empty rows */
+                        widget_unset_error (GTK_WIDGET (entry));
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "network"));
+                        widget_unset_error (GTK_WIDGET (gateway_entry));
+                        continue;
+                }
+
+                if (!nm_utils_ipaddr_valid (AF_INET, text_address)) {
+                        widget_set_error (GTK_WIDGET (entry));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (entry));
+                }
+
+                if (!parse_netmask (text_netmask, &prefix)) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "network"));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (g_object_get_data (G_OBJECT (row), "network"));
+                }
+
+                if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)) &&
+                    *text_gateway &&
+                    !nm_utils_ipaddr_valid (AF_INET, text_gateway)) {
+                        widget_set_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                        ret = FALSE;
+                } else {
+                         widget_unset_error (GTK_WIDGET (gateway_entry));
+                         if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)) && *text_gateway) {
+                                 g_assert (default_gateway == NULL);
+                                 default_gateway = text_gateway;
+                         }
+                }
+
+                if (!ret)
+                        continue;
+
+                addr = nm_ip_address_new (AF_INET, text_address, prefix, NULL);
+                if (addr)
+                        g_ptr_array_add (addresses, addr);
+
+                if (!l || !l->next)
+                        ensure_empty_address_row (page);
+        }
+        g_list_free (children);
+
+        if (addresses->len == 0) {
+                g_ptr_array_free (addresses, TRUE);
+                addresses = NULL;
+        }
+
+        dns_servers = g_ptr_array_new_with_free_func (g_free);
+        dns_text = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (page->dns_entry))));
+        if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) ||
+            g_str_equal (method, NM_SETTING_IP4_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;
+
+                text = dns_addresses[i];
+
+                if (!text || !*text)
+                        continue;
+
+                if (!nm_utils_ipaddr_valid (AF_INET, text)) {
+                        g_ptr_array_remove_range (dns_servers, 0, dns_servers->len);
+                        widget_set_error (page->dns_entry);
+                        ret = FALSE;
+                        break;
+                } else {
+                        widget_unset_error (page->dns_entry);
+                        g_ptr_array_add (dns_servers, g_strdup (text));
+                }
+        }
+        g_clear_pointer (&dns_addresses, g_strfreev);
+
+        if (dns_servers->len == 0) {
+                g_ptr_array_free (dns_servers, TRUE);
+                dns_servers = NULL;
+        } else {
+                g_ptr_array_add (dns_servers, NULL);
+        }
+
+        routes = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_route_unref);
+        if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) ||
+            g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
+                children = gtk_container_get_children (GTK_CONTAINER (page->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_netmask;
+                const gchar *text_gateway;
+                const gchar *text_metric;
+                gint64 metric;
+                guint32 netmask;
+                NMIPRoute *route;
+
+                entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address"));
+                if (!entry)
+                        continue;
+
+                text_address = gtk_entry_get_text (entry);
+                text_netmask = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "netmask")));
+                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_netmask && !*text_gateway && !*text_metric) {
+                        /* ignore empty rows */
+                        continue;
+                }
+
+                if (text_address && !nm_utils_ipaddr_valid (AF_INET, text_address)) {
+                        widget_set_error (GTK_WIDGET (entry));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (entry));
+                }
+
+                if (!parse_netmask (text_netmask, &netmask)) {
+                        widget_set_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "netmask")));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "netmask")));
+                }
+
+                if (text_gateway && !nm_utils_ipaddr_valid (AF_INET, text_gateway)) {
+                        widget_set_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway")));
+                        ret = FALSE;
+                } else {
+                        widget_unset_error (GTK_WIDGET (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 || metric < 0 || metric > G_MAXUINT32) {
+                                widget_set_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "metric")));
+                                ret = FALSE;
+                        } else {
+                                widget_unset_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "metric")));
+                        }
+                } else {
+                        widget_unset_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "metric")));
+                }
+
+                if (!ret)
+                        continue;
+
+                route = nm_ip_route_new (AF_INET, text_address, netmask, text_gateway, metric, NULL);
+                if (route)
+                        g_ptr_array_add (routes, route);
+
+                if (!l || !l->next)
+                        ensure_empty_routes_row (page);
+        }
+        g_list_free (children);
+
+        if (routes->len == 0) {
+                g_ptr_array_free (routes, TRUE);
+                routes = NULL;
+        }
+
+        if (!ret)
+                goto out;
+
+        ignore_auto_dns = !gtk_switch_get_active (page->auto_dns);
+        ignore_auto_routes = !gtk_switch_get_active (page->auto_routes);
+        never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default));
+
+        g_object_set (page->setting,
+                      NM_SETTING_IP_CONFIG_METHOD, method,
+                      NM_SETTING_IP_CONFIG_ADDRESSES, addresses,
+                      NM_SETTING_IP_CONFIG_GATEWAY, default_gateway,
+                      NM_SETTING_IP_CONFIG_DNS, dns_servers ? dns_servers->pdata : NULL,
+                      NM_SETTING_IP_CONFIG_ROUTES, routes,
+                      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:
+        if (addresses)
+                g_ptr_array_free (addresses, TRUE);
+
+        if (dns_servers)
+                g_ptr_array_free (dns_servers, TRUE);
+
+        if (routes)
+                g_ptr_array_free (routes, TRUE);
+
+        g_clear_pointer (&dns_text, g_free);
+
+        return ret;
+}
+
+static gboolean
+validate (CEPage        *page,
+          NMConnection  *connection,
+          GError       **error)
+{
+        if (!ui_to_setting (CE_PAGE_IP4 (page)))
+                return FALSE;
+
+        return nm_setting_verify (NM_SETTING (CE_PAGE_IP4 (page)->setting), NULL, error);
+}
+
+static void
+ce_page_ip4_init (CEPageIP4 *page)
+{
+}
+
+static void
+ce_page_ip4_class_init (CEPageIP4Class *class)
+{
+        CEPageClass *page_class= CE_PAGE_CLASS (class);
+
+        page_class->validate = validate;
+}
+
+CEPage *
+ce_page_ip4_new (NMConnection     *connection,
+                 NMClient         *client)
+{
+        CEPageIP4 *page;
+
+        page = CE_PAGE_IP4 (ce_page_new (CE_TYPE_PAGE_IP4,
+                                           connection,
+                                           client,
+                                           "/org/gnome/control-center/network/ip4-page.ui",
+                                           _("IPv4")));
+
+        page->setting = nm_connection_get_setting_ip4_config (connection);
+        if (!page->setting) {
+                page->setting = NM_SETTING_IP_CONFIG (nm_setting_ip4_config_new ());
+                nm_connection_add_setting (connection, NM_SETTING (page->setting));
+        }
+
+        connect_ip4_page (page);
+
+        return CE_PAGE (page);
+}

=== added file 'panels/network/connection-editor/ce-page-ip4.h'
--- panels/network/connection-editor/ce-page-ip4.h	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ip4.h	2019-05-01 13:56:52 +0000
@@ -0,0 +1,70 @@
+/* -*- 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 ip4.
+ *
+ * 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.
+ */
+
+#ifndef __CE_PAGE_IP4_H
+#define __CE_PAGE_IP4_H
+
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+#include "ce-page.h"
+
+G_BEGIN_DECLS
+
+#define CE_TYPE_PAGE_IP4          (ce_page_ip4_get_type ())
+#define CE_PAGE_IP4(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), CE_TYPE_PAGE_IP4, CEPageIP4))
+#define CE_PAGE_IP4_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), CE_TYPE_PAGE_IP4, CEPageIP4Class))
+#define CE_IS_PAGE_IP4(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), CE_TYPE_PAGE_IP4))
+#define CE_IS_PAGE_IP4_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), CE_TYPE_PAGE_IP4))
+#define CE_PAGE_IP4_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), CE_TYPE_PAGE_IP4, CEPageIP4Class))
+
+typedef struct _CEPageIP4          CEPageIP4;
+typedef struct _CEPageIP4Class     CEPageIP4Class;
+
+struct _CEPageIP4
+{
+        CEPage parent;
+
+        NMSettingIPConfig *setting;
+
+        GtkToggleButton *disabled;
+        GtkWidget       *address_list;
+        GtkSwitch       *auto_dns;
+        GtkWidget       *dns_entry;
+        GtkSwitch       *auto_routes;
+        GtkWidget       *routes_list;
+        GtkWidget       *never_default;
+};
+
+struct _CEPageIP4Class
+{
+        CEPageClass parent_class;
+};
+
+GType   ce_page_ip4_get_type (void);
+
+CEPage *ce_page_ip4_new      (NMConnection     *connection,
+                              NMClient         *client);
+
+G_END_DECLS
+
+#endif /* __CE_PAGE_IP4_H */
+

=== added file 'panels/network/connection-editor/ce-page-ip6.c'
--- panels/network/connection-editor/ce-page-ip6.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ip6.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,838 @@
+/* -*- 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-object.h>
+#include <glib/gi18n.h>
+#include <NetworkManager.h>
+
+#include "shell/list-box-helper.h"
+#include "ce-page-ip6.h"
+#include "ui-helpers.h"
+
+#define RADIO_IS_ACTIVE(x) (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(CE_PAGE (page)->builder, x))))
+
+static void ensure_empty_address_row (CEPageIP6 *page);
+static void ensure_empty_routes_row (CEPageIP6 *page);
+
+G_DEFINE_TYPE (CEPageIP6, ce_page_ip6, CE_TYPE_PAGE)
+
+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_IGNORE
+};
+
+static void
+method_changed (GtkToggleButton *button, CEPageIP6 *page)
+{
+        gboolean addr_enabled;
+        gboolean dns_enabled;
+        gboolean routes_enabled;
+        GtkWidget *widget;
+
+        if (RADIO_IS_ACTIVE ("radio_disabled")) {
+                addr_enabled = FALSE;
+                dns_enabled = FALSE;
+                routes_enabled = FALSE;
+        } else {
+                addr_enabled = RADIO_IS_ACTIVE ("radio_manual");
+                dns_enabled = !RADIO_IS_ACTIVE ("radio_local");
+                routes_enabled = !RADIO_IS_ACTIVE ("radio_local");
+        }
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+        gtk_widget_set_visible (widget, addr_enabled);
+        gtk_widget_set_sensitive (page->dns_entry, dns_enabled);
+        gtk_widget_set_sensitive (page->routes_list, routes_enabled);
+        gtk_widget_set_sensitive (page->never_default, routes_enabled);
+
+        ce_page_changed (CE_PAGE (page));
+}
+
+static void
+switch_toggled (GObject    *object,
+                GParamSpec *pspec,
+                CEPage     *page)
+{
+        ce_page_changed (page);
+}
+
+static void
+update_row_sensitivity (CEPageIP6 *page, 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 (GtkButton *button, CEPageIP6 *page)
+{
+        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 (page));
+
+        update_row_sensitivity (page, 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 gint
+sort_first_last (gconstpointer a, gconstpointer b, gpointer data)
+{
+        gboolean afirst, bfirst, alast, blast;
+
+        afirst = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "first"));
+        bfirst = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "first"));
+        alast = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "last"));
+        blast = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "last"));
+
+        if (afirst)
+                return -1;
+        if (bfirst)
+                return 1;
+        if (alast)
+                return 1;
+        if (blast)
+                return -1;
+
+        return 0;
+}
+
+static void
+add_address_row (CEPageIP6   *page,
+                 const gchar *address,
+                 const gchar *network,
+                 const gchar *gateway)
+{
+        GtkSizeGroup *group;
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), page);
+        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 (delete_button, "clicked", G_CALLBACK (remove_row), page);
+        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);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "address_sizegroup"));
+        gtk_size_group_add_widget (group, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (page->address_list), row);
+
+        update_row_sensitivity (page, page->address_list);
+}
+
+static void
+ensure_empty_address_row (CEPageIP6 *page)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (page->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 (page, "", "", "");
+
+        g_list_free (children);
+}
+
+static void
+add_address_section (CEPageIP6 *page)
+{
+        GtkWidget *widget;
+        GtkWidget *list;
+        gint i;
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+
+        page->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_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (widget), list);
+
+        for (i = 0; i < nm_setting_ip_config_get_num_addresses (page->setting); i++) {
+                NMIPAddress *addr;
+                char *netmask;
+
+                addr = nm_setting_ip_config_get_address (page->setting, i);
+                netmask = g_strdup_printf ("%u", nm_ip_address_get_prefix (addr));
+                add_address_row (page, nm_ip_address_get_address (addr), netmask,
+                                 i == 0 ? nm_setting_ip_config_get_gateway (page->setting) : NULL);
+                g_free (netmask);
+        }
+        if (nm_setting_ip_config_get_num_addresses (page->setting) == 0)
+                ensure_empty_address_row (page);
+
+        gtk_widget_show_all (widget);
+}
+
+static void
+add_dns_section (CEPageIP6 *page)
+{
+        GtkEntry *entry;
+        GString *string;
+        gint i;
+
+        page->auto_dns = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_dns_switch"));
+        gtk_switch_set_active (page->auto_dns, !nm_setting_ip_config_get_ignore_auto_dns (page->setting));
+        g_signal_connect (page->auto_dns, "notify::active", G_CALLBACK (switch_toggled), page);
+
+        page->dns_entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "dns_entry"));
+        entry = GTK_ENTRY (page->dns_entry);
+        string = g_string_new ("");
+
+        for (i = 0; i < nm_setting_ip_config_get_num_dns (page->setting); i++) {
+                const char *address;
+
+                address = nm_setting_ip_config_get_dns (page->setting, i);
+
+                if (i > 0)
+                        g_string_append (string, ", ");
+
+                g_string_append (string, address);
+
+        }
+
+        gtk_entry_set_text (entry, string->str);
+
+        g_signal_connect_swapped (page->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), page);
+
+        g_string_free (string, TRUE);
+}
+
+static void
+add_route_row (CEPageIP6   *page,
+               const gchar *address,
+               const gchar *prefix,
+               const gchar *gateway,
+               const gchar *metric)
+{
+        GtkSizeGroup *group;
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+        g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
+        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);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
+        delete_button = gtk_button_new ();
+        gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
+        g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page);
+        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);
+
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, delete_button);
+
+        gtk_container_add (GTK_CONTAINER (row), row_box);
+        gtk_widget_show_all (row);
+        gtk_container_add (GTK_CONTAINER (page->routes_list), row);
+
+        update_row_sensitivity (page, page->routes_list);
+}
+
+static void
+ensure_empty_routes_row (CEPageIP6 *page)
+{
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (page->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 (page, "", NULL, "", NULL);
+
+        g_list_free (children);
+}
+
+static void
+add_empty_route_row (CEPageIP6 *page)
+{
+        add_route_row (page, "", NULL, "", NULL);
+}
+
+static void
+add_routes_section (CEPageIP6 *page)
+{
+        GtkWidget *widget;
+        GtkWidget *list;
+        gint i;
+
+        widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
+
+        page->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_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
+        gtk_container_add (GTK_CONTAINER (widget), list);
+        page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_routes_switch"));
+        gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes (page->setting));
+        g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page);
+
+        for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) {
+                NMIPRoute *route;
+                char *prefix, *metric;
+
+                route = nm_setting_ip_config_get_route (page->setting, i);
+                prefix = g_strdup_printf ("%u", nm_ip_route_get_prefix (route));
+                metric = g_strdup_printf ("%u", (guint32) MIN (0, nm_ip_route_get_metric (route)));
+                add_route_row (page, nm_ip_route_get_dest (route),
+                               prefix,
+                               nm_ip_route_get_next_hop (route),
+                               metric);
+                g_free (prefix);
+                g_free (metric);
+        }
+        if (nm_setting_ip_config_get_num_routes (page->setting) == 0)
+                add_empty_route_row (page);
+
+        gtk_widget_show_all (widget);
+}
+
+enum
+{
+        RADIO_AUTOMATIC,
+        RADIO_DHCP,
+        RADIO_LOCAL,
+        RADIO_MANUAL,
+        RADIO_DISABLED,
+        N_RADIO
+};
+
+static void
+connect_ip6_page (CEPageIP6 *page)
+{
+        GtkToggleButton *radios[N_RADIO];
+        GtkWidget *content;
+        const gchar *str_method;
+        gboolean disabled;
+        guint method, i;
+
+        add_address_section (page);
+        add_dns_section (page);
+        add_routes_section (page);
+
+        page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_disabled"));
+
+        str_method = nm_setting_ip_config_get_method (page->setting);
+        disabled = g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0;
+        gtk_toggle_button_set_active (page->disabled, disabled);
+        g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page);
+        content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content"));
+        g_object_bind_property (page->disabled, "active",
+                                content, "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_IGNORE) == 0) {
+                method = IP6_METHOD_IGNORE;
+        }
+
+        page->never_default = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "never_default_check"));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->never_default),
+                                      nm_setting_ip_config_get_never_default (page->setting));
+        g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page);
+
+
+        /* Connect radio buttons */
+        radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_automatic"));
+        radios[RADIO_DHCP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_dhcp"));
+        radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_local"));
+        radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "radio_manual"));
+        radios[RADIO_DISABLED] = page->disabled;
+
+        for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++)
+                g_signal_connect (radios[i], "toggled", G_CALLBACK (method_changed), page);
+
+        switch (method) {
+        case IP6_METHOD_AUTO:
+                gtk_toggle_button_set_active (radios[RADIO_AUTOMATIC], TRUE);
+                break;
+        case IP6_METHOD_DHCP:
+                gtk_toggle_button_set_active (radios[RADIO_DHCP], TRUE);
+                break;
+        case IP6_METHOD_LINK_LOCAL:
+                gtk_toggle_button_set_active (radios[RADIO_LOCAL], TRUE);
+                break;
+        case IP6_METHOD_MANUAL:
+                gtk_toggle_button_set_active (radios[RADIO_MANUAL], TRUE);
+                break;
+        case IP6_METHOD_IGNORE:
+                gtk_toggle_button_set_active (radios[RADIO_DISABLED], TRUE);
+                break;
+        default:
+                break;
+        }
+
+        method_changed (NULL, page);
+}
+
+static gboolean
+ui_to_setting (CEPageIP6 *page)
+{
+        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 (page->disabled)) {
+                method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
+        } else {
+                if (RADIO_IS_ACTIVE ("radio_manual")) {
+                        method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+                } else if (RADIO_IS_ACTIVE ("radio_local")) {
+                        method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
+                } else if (RADIO_IS_ACTIVE ("radio_dhcp")) {
+                        method = NM_SETTING_IP6_CONFIG_METHOD_DHCP;
+                } else if (RADIO_IS_ACTIVE ("radio_automatic")) {
+                        method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
+                }
+        }
+
+        nm_setting_ip_config_clear_addresses (page->setting);
+        if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
+                children = gtk_container_get_children (GTK_CONTAINER (page->address_list));
+        } else {
+                g_object_set (G_OBJECT (page->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"));
+                        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 (page->setting),
+                                      NM_SETTING_IP_CONFIG_GATEWAY, text_gateway,
+                                      NULL);
+                nm_setting_ip_config_add_address (page->setting, addr);
+
+                if (!l || !l->next)
+                        ensure_empty_address_row (page);
+        }
+        g_list_free (children);
+
+        nm_setting_ip_config_clear_dns (page->setting);
+        dns_text = g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (page->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 (page->dns_entry);
+                        ret = FALSE;
+                        break;
+                } else {
+                        widget_unset_error (page->dns_entry);
+                        nm_setting_ip_config_add_dns (page->setting, text);
+                }
+        }
+
+        nm_setting_ip_config_clear_routes (page->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 (page->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, 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 = 0;
+                if (*text_metric) {
+                        errno = 0;
+                        metric = strtoul (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 (page->setting, route);
+                nm_ip_route_unref (route);
+
+                if (!l || !l->next)
+                        ensure_empty_routes_row (page);
+        }
+        g_list_free (children);
+
+        if (!ret)
+                goto out;
+
+        ignore_auto_dns = !gtk_switch_get_active (page->auto_dns);
+        ignore_auto_routes = !gtk_switch_get_active (page->auto_routes);
+        never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default));
+
+        g_object_set (page->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 gboolean
+validate (CEPage        *page,
+          NMConnection  *connection,
+          GError       **error)
+{
+        if (!ui_to_setting (CE_PAGE_IP6 (page)))
+                return FALSE;
+
+        return nm_setting_verify (NM_SETTING (CE_PAGE_IP6 (page)->setting), NULL, error);
+}
+
+static void
+ce_page_ip6_init (CEPageIP6 *page)
+{
+}
+
+static void
+ce_page_ip6_class_init (CEPageIP6Class *class)
+{
+        CEPageClass *page_class= CE_PAGE_CLASS (class);
+
+        page_class->validate = validate;
+}
+
+CEPage *
+ce_page_ip6_new (NMConnection     *connection,
+                 NMClient         *client)
+{
+        CEPageIP6 *page;
+
+        page = CE_PAGE_IP6 (ce_page_new (CE_TYPE_PAGE_IP6,
+                                           connection,
+                                           client,
+                                           "/org/gnome/control-center/network/ip6-page.ui",
+                                           _("IPv6")));
+
+        page->setting = nm_connection_get_setting_ip6_config (connection);
+        if (!page->setting) {
+                page->setting = NM_SETTING_IP_CONFIG (nm_setting_ip6_config_new ());
+                nm_connection_add_setting (connection, NM_SETTING (page->setting));
+        }
+
+        connect_ip6_page (page);
+
+        return CE_PAGE (page);
+}

=== added file 'panels/network/connection-editor/ce-page-ip6.h'
--- panels/network/connection-editor/ce-page-ip6.h	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-ip6.h	2019-05-01 13:56:52 +0000
@@ -0,0 +1,70 @@
+/* -*- 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 ip6.
+ *
+ * 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.
+ */
+
+#ifndef __CE_PAGE_IP6_H
+#define __CE_PAGE_IP6_H
+
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+#include "ce-page.h"
+
+G_BEGIN_DECLS
+
+#define CE_TYPE_PAGE_IP6          (ce_page_ip6_get_type ())
+#define CE_PAGE_IP6(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), CE_TYPE_PAGE_IP6, CEPageIP6))
+#define CE_PAGE_IP6_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), CE_TYPE_PAGE_IP6, CEPageIP6Class))
+#define CE_IS_PAGE_IP6(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), CE_TYPE_PAGE_IP6))
+#define CE_IS_PAGE_IP6_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), CE_TYPE_PAGE_IP6))
+#define CE_PAGE_IP6_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), CE_TYPE_PAGE_IP6, CEPageIP6Class))
+
+typedef struct _CEPageIP6          CEPageIP6;
+typedef struct _CEPageIP6Class     CEPageIP6Class;
+
+struct _CEPageIP6
+{
+        CEPage parent;
+
+        NMSettingIPConfig *setting;
+
+        GtkToggleButton *disabled;
+        GtkWidget       *address_list;
+        GtkSwitch       *auto_dns;
+        GtkWidget       *dns_entry;
+        GtkSwitch       *auto_routes;
+        GtkWidget       *routes_list;
+        GtkWidget       *never_default;
+};
+
+struct _CEPageIP6Class
+{
+        CEPageClass parent_class;
+};
+
+GType   ce_page_ip6_get_type (void);
+
+CEPage *ce_page_ip6_new      (NMConnection     *connection,
+                              NMClient         *client);
+
+G_END_DECLS
+
+#endif /* __CE_PAGE_IP6_H */
+

=== added file 'panels/network/connection-editor/ce-page-security.c'
--- panels/network/connection-editor/ce-page-security.c	1970-01-01 00:00:00 +0000
+++ panels/network/connection-editor/ce-page-security.c	2019-05-01 13:56:52 +0000
@@ -0,0 +1,467 @@
+/* -*- 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 <glib-object.h>
+#include <glib/gi18n.h>
+
+#include <NetworkManager.h>
+
+#include "wireless-security.h"
+#include "ce-page-security.h"
+
+G_DEFINE_TYPE (CEPageSecurity, ce_page_security, CE_TYPE_PAGE)
+
+enum {
+        S_NAME_COLUMN,
+        S_SEC_COLUMN,
+        S_ADHOC_VALID_COLUMN
+};
+
+static gboolean
+find_proto (NMSettingWirelessSecurity *sec, const char *item)
+{
+        guint32 i;
+
+        for (i = 0; i < nm_setting_wireless_security_get_num_protos (sec); i++) {
+                if (!strcmp (item, nm_setting_wireless_security_get_proto (sec, i)))
+                        return TRUE;
+        }
+        return FALSE;
+}
+
+static NMUtilsSecurityType
+get_default_type_for_security (NMSettingWirelessSecurity *sec)
+{
+        const char *key_mgmt, *auth_alg;
+
+        g_return_val_if_fail (sec != NULL, NMU_SEC_NONE);
+
+        key_mgmt = nm_setting_wireless_security_get_key_mgmt (sec);
+        auth_alg = nm_setting_wireless_security_get_auth_alg (sec);
+
+        /* No IEEE 802.1x */
+        if (!strcmp (key_mgmt, "none"))
+                return NMU_SEC_STATIC_WEP;
+
+        if (!strcmp (key_mgmt, "ieee8021x")) {
+                if (auth_alg && !strcmp (auth_alg, "leap"))
+                        return NMU_SEC_LEAP;
+                return NMU_SEC_DYNAMIC_WEP;
+        }
+
+        if (   !strcmp (key_mgmt, "wpa-none")
+            || !strcmp (key_mgmt, "wpa-psk")) {
+                if (find_proto (sec, "rsn"))
+                        return NMU_SEC_WPA2_PSK;
+                else if (find_proto (sec, "wpa"))
+                        return NMU_SEC_WPA_PSK;
+                else
+                        return NMU_SEC_WPA_PSK;
+        }
+
+        if (!strcmp (key_mgmt, "wpa-eap")) {
+                if (find_proto (sec, "rsn"))
+                        return NMU_SEC_WPA2_ENTERPRISE;
+                else if (find_proto (sec, "wpa"))
+                        return NMU_SEC_WPA_ENTERPRISE;
+                else
+                        return NMU_SEC_WPA_ENTERPRISE;
+        }
+
+        return NMU_SEC_INVALID;
+}
+
+static WirelessSecurity *
+security_combo_get_active (CEPageSecurity *page)
+{
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+        WirelessSecurity *sec = NULL;
+
+        model = gtk_combo_box_get_model (page->security_combo);
+        gtk_combo_box_get_active_iter (page->security_combo, &iter);
+        gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+
+        return sec;
+}
+
+static void
+wsec_size_group_clear (GtkSizeGroup *group)
+{
+        GSList *children;
+        GSList *iter;
+
+        g_return_if_fail (group != NULL);
+
+        children = gtk_size_group_get_widgets (group);
+        for (iter = children; iter; iter = g_slist_next (iter))
+                gtk_size_group_remove_widget (group, GTK_WIDGET (iter->data));
+}
+
+static void
+security_combo_changed (GtkComboBox *combo,
+                        gpointer     user_data)
+{
+        CEPageSecurity *page = CE_PAGE_SECURITY (user_data);
+        GtkWidget *vbox;
+        GList *l, *children;
+        WirelessSecurity *sec;
+
+        wsec_size_group_clear (page->group);
+
+        vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox"));
+        children = gtk_container_get_children (GTK_CONTAINER (vbox));
+        for (l = children; l; l = l->next) {
+                gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (l->data));
+        }
+
+        sec = security_combo_get_active (page);
+        if (sec) {
+                GtkWidget *sec_widget;
+                GtkWidget *parent;
+
+                sec_widget = wireless_security_get_widget (sec);
+                g_assert (sec_widget);
+                parent = gtk_widget_get_parent (sec_widget);
+                if (parent)
+                        gtk_container_remove (GTK_CONTAINER (parent), sec_widget);
+
+                gtk_size_group_add_widget (page->group, page->security_heading);
+                wireless_security_add_to_size_group (sec, page->group);
+
+                gtk_container_add (GTK_CONTAINER (vbox), sec_widget);
+                wireless_security_unref (sec);
+        }
+
+        ce_page_changed (CE_PAGE (page));
+}
+
+static void
+stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
+{
+        ce_page_changed (CE_PAGE (user_data));
+}
+
+static void
+add_security_item (CEPageSecurity   *page,
+                   WirelessSecurity *sec,
+                   GtkListStore     *model,
+                   GtkTreeIter      *iter,
+                   const char       *text,
+                   gboolean          adhoc_valid)
+{
+        wireless_security_set_changed_notify (sec, stuff_changed_cb, page);
+        gtk_list_store_append (model, iter);
+        gtk_list_store_set (model, iter,
+                            S_NAME_COLUMN, text,
+                            S_SEC_COLUMN, sec,
+                            S_ADHOC_VALID_COLUMN, adhoc_valid,
+                            -1);
+        wireless_security_unref (sec);
+}
+
+static void
+set_sensitive (GtkCellLayout *cell_layout,
+               GtkCellRenderer *cell,
+               GtkTreeModel *tree_model,
+               GtkTreeIter *iter,
+               gpointer data)
+{
+        gboolean *adhoc = data;
+        gboolean sensitive = TRUE, adhoc_valid = TRUE;
+
+        gtk_tree_model_get (tree_model, iter, S_ADHOC_VALID_COLUMN, &adhoc_valid, -1);
+        if (*adhoc && !adhoc_valid)
+                sensitive = FALSE;
+
+        g_object_set (cell, "sensitive", sensitive, NULL);
+}
+
+static void
+finish_setup (CEPageSecurity *page)
+{
+        NMConnection *connection = CE_PAGE (page)->connection;
+        NMSettingWireless *sw;
+        NMSettingWirelessSecurity *sws;
+        gboolean is_adhoc = FALSE;
+        GtkListStore *sec_model;
+        GtkTreeIter iter;
+        const gchar *mode;
+        guint32 dev_caps = 0;
+        NMUtilsSecurityType default_type = NMU_SEC_NONE;
+        int active = -1;
+        int item = 0;
+        GtkComboBox *combo;
+        GtkCellRenderer *renderer;
+
+        sw = nm_connection_get_setting_wireless (connection);
+        g_assert (sw);
+
+        page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+        page->security_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec"));
+        page->security_combo = combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_sec"));
+
+        dev_caps =   NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+                   | NM_WIFI_DEVICE_CAP_CIPHER_WEP104
+                   | NM_WIFI_DEVICE_CAP_CIPHER_TKIP
+                   | NM_WIFI_DEVICE_CAP_CIPHER_CCMP
+                   | NM_WIFI_DEVICE_CAP_WPA
+                   | NM_WIFI_DEVICE_CAP_RSN;
+
+        mode = nm_setting_wireless_get_mode (sw);
+        if (mode && !strcmp (mode, "adhoc"))
+                is_adhoc = TRUE;
+        page->adhoc = is_adhoc;
+
+        sws = nm_connection_get_setting_wireless_security (connection);
+        if (sws)
+                default_type = get_default_type_for_security (sws);
+
+        sec_model = gtk_list_store_new (3, G_TYPE_STRING, WIRELESS_TYPE_SECURITY, G_TYPE_BOOLEAN);
+
+        if (nm_utils_security_valid (NMU_SEC_NONE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                gtk_list_store_insert_with_values (sec_model, &iter, -1,
+                                                   S_NAME_COLUMN, C_("Wi-Fi/Ethernet security", "None"),
+                                                   S_ADHOC_VALID_COLUMN, TRUE,
+                                                   -1);
+                if (default_type == NMU_SEC_NONE)
+                        active = item;
+                item++;
+        }
+
+        if (nm_utils_security_valid (NMU_SEC_STATIC_WEP, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                WirelessSecurityWEPKey *ws_wep;
+                NMWepKeyType wep_type = NM_WEP_KEY_TYPE_KEY;
+
+                if (default_type == NMU_SEC_STATIC_WEP) {
+                        sws = nm_connection_get_setting_wireless_security (connection);
+                        if (sws)
+                                wep_type = nm_setting_wireless_security_get_wep_key_type (sws);
+                        if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN)
+                                wep_type = NM_WEP_KEY_TYPE_KEY;
+                }
+
+                ws_wep = ws_wep_key_new (connection, NM_WEP_KEY_TYPE_KEY, FALSE, FALSE);
+                if (ws_wep) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_wep), sec_model,
+                                           &iter, _("WEP 40/128-bit Key (Hex or ASCII)"),
+                                           TRUE);
+                        if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_KEY))
+                                active = item;
+                        item++;
+                }
+
+                ws_wep = ws_wep_key_new (connection, NM_WEP_KEY_TYPE_PASSPHRASE, FALSE, FALSE);
+                if (ws_wep) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_wep), sec_model,
+                                           &iter, _("WEP 128-bit Passphrase"), TRUE);
+                        if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == NM_WEP_KEY_TYPE_PASSPHRASE))
+                                active = item;
+                        item++;
+                }
+        }
+
+        if (nm_utils_security_valid (NMU_SEC_LEAP, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                WirelessSecurityLEAP *ws_leap;
+
+                ws_leap = ws_leap_new (connection, FALSE);
+                if (ws_leap) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_leap), sec_model,
+                                           &iter, _("LEAP"), FALSE);
+                        if ((active < 0) && (default_type == NMU_SEC_LEAP))
+                                active = item;
+                        item++;
+                }
+        }
+
+        if (nm_utils_security_valid (NMU_SEC_DYNAMIC_WEP, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                WirelessSecurityDynamicWEP *ws_dynamic_wep;
+
+                ws_dynamic_wep = ws_dynamic_wep_new (connection, TRUE, FALSE);
+                if (ws_dynamic_wep) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_dynamic_wep), sec_model,
+                                           &iter, _("Dynamic WEP (802.1x)"), FALSE);
+                        if ((active < 0) && (default_type == NMU_SEC_DYNAMIC_WEP))
+                                active = item;
+                        item++;
+                }
+        }
+
+        if (nm_utils_security_valid (NMU_SEC_WPA_PSK, dev_caps, FALSE, is_adhoc, 0, 0, 0) ||
+            nm_utils_security_valid (NMU_SEC_WPA2_PSK, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                WirelessSecurityWPAPSK *ws_wpa_psk;
+
+                ws_wpa_psk = ws_wpa_psk_new (connection, FALSE);
+                if (ws_wpa_psk) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_wpa_psk), sec_model,
+                                           &iter, _("WPA & WPA2 Personal"), FALSE);
+                        if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == NMU_SEC_WPA2_PSK)))
+                                active = item;
+                        item++;
+                }
+        }
+
+        if (nm_utils_security_valid (NMU_SEC_WPA_ENTERPRISE, dev_caps, FALSE, is_adhoc, 0, 0, 0) ||
+            nm_utils_security_valid (NMU_SEC_WPA2_ENTERPRISE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
+                WirelessSecurityWPAEAP *ws_wpa_eap;
+
+                ws_wpa_eap = ws_wpa_eap_new (connection, TRUE, FALSE);
+                if (ws_wpa_eap) {
+                        add_security_item (page, WIRELESS_SECURITY (ws_wpa_eap), sec_model,
+                                           &iter, _("WPA & WPA2 Enterprise"), FALSE);
+                        if ((active < 0) && ((default_type == NMU_SEC_WPA_ENTERPRISE) || (default_type == NMU_SEC_WPA2_ENTERPRISE)))
+                                active = item;
+                        item++;
+                }
+        }
+
+        gtk_combo_box_set_model (combo, GTK_TREE_MODEL (sec_model));
+        gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
+
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", S_NAME_COLUMN, NULL);
+        gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), renderer, set_sensitive, &page->adhoc, NULL);
+
+        gtk_combo_box_set_active (combo, active < 0 ? 0 : (guint32) active);
+        g_object_unref (G_OBJECT (sec_model));
+
+        page->security_combo = combo;
+
+        security_combo_changed (combo, page);
+        g_signal_connect (combo, "changed",
+                          G_CALLBACK (security_combo_changed), page);
+}
+
+static gboolean
+validate (CEPage        *page,
+          NMConnection  *connection,
+          GError       **error)