Merge lp:~pete-woods/indicator-network/ethernet-support into lp:indicator-network

[Pete Woods]

Add ethernet support.

Add ethernet support.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:649
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1217/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1224
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1009/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1009/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1009/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1009/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1009/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1009/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:649
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1218/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1225
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1010/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1010/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1010/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1010/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1010/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1010/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/36/rebuild

review: Needs Fixing (continuous-integration)

=== added file 'data/nm-device-ethernet.xml'
--- data/nm-device-ethernet.xml	1970-01-01 00:00:00 +0000
+++ data/nm-device-ethernet.xml	2016-12-05 18:14:38 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <interface name="org.freedesktop.NetworkManager.Device.Wired">
+    <annotation name="org.gtk.GDBus.C.Name" value="DeviceEthernet"/>
+
+    <!--
+        HwAddress:
+
+        Active hardware address of the device.
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        PermHwAddress:
+
+        Permanent hardware address of the device.
+    -->
+    <property name="PermHwAddress" type="s" access="read"/>
+
+    <!--
+        Speed:
+
+        Design speed of the device, in megabits/second (Mb/s).
+    -->
+    <property name="Speed" type="u" access="read"/>
+
+    <!--
+        S390Subchannels:
+
+        Array of S/390 subchannels for S/390 or z/Architecture devices.
+    -->
+    <property name="S390Subchannels" type="as" access="read"/>
+
+    <!--
+        Carrier:
+
+        Indicates whether the physical carrier is found (e.g. whether a cable is
+        plugged in or not).
+    -->
+    <property name="Carrier" type="b" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+    -->
+    <signal name="PropertiesChanged">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg name="properties" type="a{sv}"/>
+    </signal>
+  </interface>
+</node>

=== modified file 'debian/changelog'
--- debian/changelog	2016-11-11 11:09:08 +0000
+++ debian/changelog	2016-12-05 18:14:38 +0000
@@ -1,3 +1,12 @@
+indicator-network (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add ethernet support to indicator (and NM dbus template).
+  * Switch to common active connection interface throughout the codebase.
+  * Re-enable tests on all arches except powerpc, ppc64el, s390x.
+  * Fix Wi-Fi widget visibility.
+
+ -- Pete <[e-mail]>  Fri, 25 Nov 2016 22:35:52 +0000
+
 indicator-network (0.8.0+17.04.20161111-0ubuntu1) zesty; urgency=medium
 
   * Fix memory corruption inside unix signal handler (LP: #1632275)

=== modified file 'debian/control'
--- debian/control	2016-10-30 15:13:34 +0000
+++ debian/control	2016-12-05 18:14:38 +0000
@@ -12,10 +12,10 @@
                graphviz,
                intltool,
                libglib2.0-dev,
-               libgmenuharness-dev (>= 0.1.1),
+               libgmenuharness-dev (>= 0.1.2),
                libqofono-dev,
                libqofono-qt5-0,
-               libqtdbusmock1-dev (>= 0.4),
+               libqtdbusmock1-dev (>= 0.6),
                libqtdbustest1-dev,
                libsecret-1-dev,
                liburl-dispatcher1-dev,
@@ -51,7 +51,7 @@
          network-manager,
          network-manager-openvpn,
          network-manager-pptp,
-         ubuntu-mobile-icons (>= 13.04+13.10.20131014),
+         ubuntu-mobile-icons (>= 16.10+16.04.20161205),
 Suggests: ofono,
           urfkill
 Conflicts: chewie,

=== modified file 'debian/rules'
--- debian/rules	2016-10-30 18:35:53 +0000
+++ debian/rules	2016-12-05 18:14:38 +0000
@@ -8,15 +8,8 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 ENABLE_TESTS = ON
-ifneq (,$(filter $(DEB_HOST_ARCH),arm64 s390x powerpc ppc64el))
-        ENABLE_TESTS = OFF
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH),i386))
-	ifeq (Ubuntu,$(DEB_VENDOR))
-		ifeq (vivid,$(DEB_DISTRIBUTION))
-			ENABLE_TESTS = OFF
-		endif
-	endif
+ifneq (,$(filter $(DEB_HOST_ARCH),s390x powerpc ppc64el))
+	ENABLE_TESTS = OFF
 endif
 
 %:

=== modified file 'po/indicator-network.pot'
--- po/indicator-network.pot	2016-04-29 14:08:19 +0000
+++ po/indicator-network.pot	2016-12-05 18:14:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-29 12:38+0300\n"
+"POT-Creation-Date: 2016-11-30 16:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,64 +38,51 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../src/indicator/menuitems/wifi-link-item.cpp:109
-msgid "Other network…"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:90
-msgid "No SIM"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:97
-msgid "SIM Error"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:105
-msgid "SIM Locked"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:118
-msgid "Unregistered"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:123
-msgid "Unknown"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:128
-msgid "Denied"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:133
-msgid "Searching"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:145
-msgid "No Signal"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:157
-#: ../src/indicator/menuitems/wwan-link-item.cpp:164
-msgid "Offline"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:187
-msgid "Wi-Fi"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:198
-msgid "Flight Mode"
-msgstr ""
-
-#: ../src/indicator/factory.cpp:208
-msgid "Cellular data"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:219
-msgid "Hotspot"
+#: ../src/indicator/vpn-status-notifier.cpp:48
+msgid "The VPN connection '%1' failed."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:50
+msgid ""
+"The VPN connection '%1' failed because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:51
+msgid ""
+"The VPN connection '%1' failed because the VPN service stopped unexpectedly."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:52
+msgid ""
+"The VPN connection '%1' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:53
+msgid ""
+"The VPN connection '%1' failed because the connection attempt timed out."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:54
+msgid ""
+"The VPN connection '%1' failed because the VPN service did not start in time."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:55
+msgid "The VPN connection '%1' failed because the VPN service failed to start."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:56
+msgid "The VPN connection '%1' failed because there were no valid VPN secrets."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:57
+msgid "The VPN connection '%1' failed because of invalid VPN secrets."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:68
+msgid "VPN Connection Failed"
 msgstr ""
 
 #: ../src/indicator/sim-unlock-dialog.cpp:144
@@ -186,70 +173,119 @@
 msgid "PIN codes did not match."
 msgstr ""
 
-#: ../src/indicator/vpn-status-notifier.cpp:48
-msgid "The VPN connection '%1' failed."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:50
-msgid ""
-"The VPN connection '%1' failed because the network connection was "
-"interrupted."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:51
-msgid ""
-"The VPN connection '%1' failed because the VPN service stopped unexpectedly."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:52
-msgid ""
-"The VPN connection '%1' failed because the VPN service returned invalid "
-"configuration."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:53
-msgid ""
-"The VPN connection '%1' failed because the connection attempt timed out."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:54
-msgid ""
-"The VPN connection '%1' failed because the VPN service did not start in time."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:55
-msgid "The VPN connection '%1' failed because the VPN service failed to start."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:56
-msgid "The VPN connection '%1' failed because there were no valid VPN secrets."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:57
-msgid "The VPN connection '%1' failed because of invalid VPN secrets."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:68
-msgid "VPN Connection Failed"
-msgstr ""
-
-#: ../src/indicator/sections/wwan-section.cpp:99
+#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
+msgid "VPN connection %1"
+msgstr ""
+
+#: ../src/indicator/menuitems/wifi-link-item.cpp:109
+msgid "Other network…"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:39
+msgid "Connected"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:40
+msgid "Connecting"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:41
+msgid "Disabled"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:42
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:43
+msgid "Online"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:44
+msgid "Failed"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:56
+msgid "Ethernet (%1)"
+msgstr ""
+
+#: ../src/indicator/menuitems/ethernet-link-item.cpp:60
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:90
+msgid "No SIM"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:97
+msgid "SIM Error"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:105
+msgid "SIM Locked"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:118
+msgid "Unregistered"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:123
+msgid "Unknown"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:128
+msgid "Denied"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:133
+msgid "Searching"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:145
+msgid "No Signal"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:157
+#: ../src/indicator/menuitems/wwan-link-item.cpp:164
+msgid "Offline"
+msgstr ""
+
+#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
+#: ../src/indicator/root-state.cpp:340
+msgid "Network"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:193
+msgid "Wi-Fi"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:204
+msgid "Flight Mode"
+msgstr ""
+
+#: ../src/indicator/factory.cpp:214
+msgid "Cellular data"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:227
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/indicator/sections/wwan-section.cpp:102
 msgid "Cellular settings…"
 msgstr ""
 
-#: ../src/indicator/sections/vpn-section.cpp:140
-msgid "VPN settings…"
+#: ../src/indicator/sections/ethernet-section.cpp:114
+msgid "Ethernet settings…"
 msgstr ""
 
 #: ../src/indicator/sections/wifi-section.cpp:65
 msgid "Wi-Fi settings…"
 msgstr ""
 
-#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
-#: ../src/indicator/root-state.cpp:306
-msgid "Network"
-msgstr ""
-
-#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
-msgid "VPN connection %1"
+#: ../src/indicator/sections/vpn-section.cpp:139
+msgid "VPN settings…"
 msgstr ""

=== modified file 'src/indicator/CMakeLists.txt'
--- src/indicator/CMakeLists.txt	2016-10-30 15:13:34 +0000
+++ src/indicator/CMakeLists.txt	2016-12-05 18:14:38 +0000
@@ -25,6 +25,8 @@
     nmofono/connection/active-connection.cpp
     nmofono/connection/active-connection-manager.cpp
     nmofono/connection/active-vpn-connection.cpp
+    nmofono/connection/available-connection.cpp
+    nmofono/ethernet/ethernet-link.cpp
     nmofono/wifi/access-point.cpp
     nmofono/wifi/access-point-impl.cpp
     nmofono/wifi/grouped-access-point.cpp
@@ -45,6 +47,8 @@
     sim-unlock-dialog.cpp
     root-state.cpp
     vpn-status-notifier.cpp
+    sections/ethernet-section.cpp
+    sections/ethernet-link-section.cpp
     sections/quick-access-section.cpp
     sections/wifi-section.cpp
     sections/vpn-section.cpp
@@ -58,6 +62,9 @@
     connectivity-service/dbus-sim.cpp
 
     menuitems/access-point-item.cpp
+    menuitems/ethernet-connection-item.cpp
+    menuitems/ethernet-item.cpp
+    menuitems/ethernet-link-item.cpp
     menuitems/switch-item.cpp
     menuitems/text-item.cpp
     menuitems/vpn-item.cpp

=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2016-07-04 17:43:21 +0000
+++ src/indicator/factory.cpp	2016-12-05 18:14:38 +0000
@@ -88,6 +88,7 @@
                     singletonNotificationManager(),
                     singletonKillSwitch(),
                     singletonHotspotManager(),
+                    singletonActiveConnectionManager(),
                     QDBusConnection::systemBus());
         }
         return m_nmofono;
@@ -155,6 +156,11 @@
     return make_unique<QuickAccessSection>(d->singletonNmofono(), flightModeSwitch);
 }
 
+unique_ptr<EthernetSection> Factory::newEthernetSection()
+{
+    return make_unique<EthernetSection>(d->singletonNmofono());
+}
+
 unique_ptr<WwanSection> Factory::newWwanSection(SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch)
 {
     return make_unique<WwanSection>(d->singletonNmofono(), mobileDataSwitch, hotspotSwitch);

=== modified file 'src/indicator/factory.h'
--- src/indicator/factory.h	2016-05-05 14:15:23 +0000
+++ src/indicator/factory.h	2016-12-05 18:14:38 +0000
@@ -26,10 +26,11 @@
 #include <connectivity-service/connectivity-service.h>
 #include <menumodel-cpp/menu-exporter.h>
 #include <menumodel-cpp/action-group-merger.h>
+#include <sections/ethernet-section.h>
 #include <sections/quick-access-section.h>
-#include <sections/vpn-section.h>
 #include <sections/wifi-section.h>
 #include <sections/wwan-section.h>
+#include <sections/vpn-section.h>
 #include <menuitems/switch-item.h>
 
 #include <memory>
@@ -58,6 +59,8 @@
 
     virtual std::unique_ptr<WwanSection> newWwanSection(SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch);
 
+    virtual EthernetSection::UPtr newEthernetSection();
+
     virtual std::unique_ptr<WifiSection> newWiFiSection(SwitchItem::Ptr wifiSwitch);
 
     virtual std::unique_ptr<VpnSection> newVpnSection();

=== modified file 'src/indicator/icons.cpp'
--- src/indicator/icons.cpp	2015-08-13 16:41:41 +0000
+++ src/indicator/icons.cpp	2016-12-05 18:14:38 +0000
@@ -89,3 +89,24 @@
     // shouldn't be reached
     return QString();
 }
+
+QString Icons::ethernetIcon(nmofono::Link::Status status)
+{
+    switch (status)
+    {
+    case Link::Status::connected:
+        return "network-wired-connected";
+    case Link::Status::connecting:
+        return "network-wired-connecting";
+    case Link::Status::disabled:
+        return "network-wired-disabled";
+    case Link::Status::offline:
+        return "network-wired-offline";
+    case Link::Status::online:
+        return "network-wired-active";
+    case Link::Status::failed:
+        return "network-wired-error";
+    }
+    // shouldn't be reached
+    return QString();
+}

=== modified file 'src/indicator/icons.h'
--- src/indicator/icons.h	2015-08-13 16:41:41 +0000
+++ src/indicator/icons.h	2016-12-05 18:14:38 +0000
@@ -34,4 +34,6 @@
     static QString bearerIcon(nmofono::wwan::Modem::Bearer bearer);
 
     static QString wifiIcon(nmofono::wifi::WifiLink::Signal signal);
+
+    static QString ethernetIcon(nmofono::Link::Status status);
 };

=== modified file 'src/indicator/menu-builder.cpp'
--- src/indicator/menu-builder.cpp	2016-10-28 15:26:53 +0000
+++ src/indicator/menu-builder.cpp	2016-12-05 18:14:38 +0000
@@ -47,10 +47,11 @@
     SwitchItem::Ptr m_hotspotSwitch;
     SwitchItem::Ptr m_wifiSwitch;
 
-    QuickAccessSection::Ptr m_quickAccessSection;
-    WifiSection::Ptr m_wifiSection;
-    WwanSection::Ptr m_wwanSection;
-    VpnSection::Ptr m_vpnSection;
+    QuickAccessSection::SPtr m_quickAccessSection;
+    EthernetSection::SPtr m_ethernetSection;
+    WifiSection::SPtr m_wifiSection;
+    WwanSection::SPtr m_wwanSection;
+    VpnSection::SPtr m_vpnSection;
 
     MenuExporter::UPtr m_desktopMenuExporter;
     MenuExporter::UPtr m_desktopGreeterMenuExporter;
@@ -156,6 +157,7 @@
 
     d->m_quickAccessSection = factory.newQuickAccessSection(d->m_flightModeSwitch);
     d->m_wwanSection = factory.newWwanSection(d->m_mobileDataSwitch, d->m_hotspotSwitch);
+    d->m_ethernetSection = factory.newEthernetSection();
     d->m_wifiSection = factory.newWiFiSection(d->m_wifiSwitch);
     d->m_vpnSection = factory.newVpnSection();
 
@@ -169,6 +171,11 @@
     d->m_phoneMenu->addSection(d->m_wwanSection);
     d->m_phoneGreeterMenu->addSection(d->m_wwanSection);
 
+    d->m_desktopMenu->addSection(d->m_ethernetSection);
+    d->m_desktopGreeterMenu->addSection(d->m_ethernetSection);
+    d->m_phoneMenu->addSection(d->m_ethernetSection);
+    d->m_phoneGreeterMenu->addSection(d->m_ethernetSection);
+
     d->m_desktopMenu->addSection(d->m_wifiSection);
     d->m_desktopGreeterMenu->addSection(d->m_wifiSection);
     d->m_phoneMenu->addSection(d->m_wifiSection);

=== added file 'src/indicator/menuitems/ethernet-connection-item.cpp'
--- src/indicator/menuitems/ethernet-connection-item.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-connection-item.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <menuitems/ethernet-connection-item.h>
+#include <QDebug>
+
+using namespace std;
+
+using namespace nmofono::connection;
+
+class EthernetConnectionItem::Private : public QObject
+{
+Q_OBJECT
+
+public:
+    Private(EthernetConnectionItem& parent) :
+            p(parent)
+    {
+    }
+
+public Q_SLOTS:
+    void
+    connectionIdChanged(const QString& connectionId)
+    {
+        m_item->setLabel(connectionId);
+    }
+
+public:
+    EthernetConnectionItem& p;
+
+    AvailableConnection::SPtr m_connection;
+
+    MenuItem::Ptr m_item;
+};
+
+EthernetConnectionItem::EthernetConnectionItem(
+        AvailableConnection::SPtr connection, Action::Ptr action) :
+        d(new Private(*this))
+{
+    d->m_connection = connection;
+    connect(d->m_connection.get(), &AvailableConnection::connectionIdChanged,
+            d.get(), &Private::connectionIdChanged);
+
+    d->m_item = make_shared<MenuItem>(d->m_connection->connectionId());
+    d->m_item->setActionAndTargetValue(
+            "indicator." + action->name(),
+            TypedVariant<string>(connection->connectionUuid().toStdString()));
+}
+
+MenuItem::Ptr
+EthernetConnectionItem::menuItem()
+{
+    return d->m_item;
+}
+
+#include "ethernet-connection-item.moc"
+

=== added file 'src/indicator/menuitems/ethernet-connection-item.h'
--- src/indicator/menuitems/ethernet-connection-item.h	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-connection-item.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <menuitems/item.h>
+#include <menumodel-cpp/menu-item.h>
+#include <nmofono/connection/available-connection.h>
+
+#include <unity/util/DefinesPtrs.h>
+
+#include <QObject>
+#include <QString>
+
+class EthernetConnectionItem : public Item
+{
+
+public:
+    UNITY_DEFINES_PTRS(EthernetConnectionItem);
+
+    EthernetConnectionItem() = delete;
+    ~EthernetConnectionItem() = default;
+    EthernetConnectionItem(nmofono::connection::AvailableConnection::SPtr connection, Action::Ptr action);
+
+    virtual MenuItem::Ptr menuItem();
+
+private:
+    class Private;
+    std::shared_ptr<Private> d;
+};

=== added file 'src/indicator/menuitems/ethernet-item.cpp'
--- src/indicator/menuitems/ethernet-item.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-item.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include "ethernet-item.h"
+#include <QDebug>
+
+using namespace std;
+
+class EthernetItem::Private : public QObject
+{
+Q_OBJECT
+
+public Q_SLOTS:
+    void
+    actionActivated(const Variant&)
+    {
+        // Remember that the GAction was only activated, and hasn't had its state changed.
+        bool newAutoConnectState = !(m_actionConnected->state().as<bool>());
+        Q_EMIT p.autoConnectChanged(newAutoConnectState);
+    }
+
+public:
+    Private(EthernetItem& parent) :
+            p(parent)
+    {
+    }
+
+    EthernetItem& p;
+
+    Action::Ptr m_actionConnected;
+    Action::Ptr m_actionStatusLabel;
+
+    MenuItem::Ptr m_item;
+};
+
+EthernetItem::EthernetItem(unsigned int id)
+{
+    d.reset(new Private(*this));
+
+    QString actionIdBase = "ethernet." + QString::number(id);
+
+    QString statusConnectedActionId = actionIdBase;
+    QString statusLabelActionId = actionIdBase + "::status-label";
+
+    d->m_actionConnected = make_shared<Action>(statusConnectedActionId, nullptr, TypedVariant<bool>(false));
+    d->m_actionStatusLabel = make_shared<Action>(statusLabelActionId, nullptr, TypedVariant<string>());
+    m_actionGroup->add(d->m_actionConnected);
+    m_actionGroup->add(d->m_actionStatusLabel);
+
+    connect(d->m_actionConnected.get(), &Action::activated, d.get(), &Private::actionActivated);
+
+    d->m_item = make_shared<MenuItem>();
+    d->m_item->setAction("indicator." + statusConnectedActionId);
+
+    d->m_item->setAttribute("x-canonical-type", TypedVariant<string>("com.canonical.indicator.switch"));
+    d->m_item->setAttribute("x-canonical-subtitle-action", TypedVariant<string>("indicator." + statusLabelActionId.toStdString()));
+}
+
+EthernetItem::~EthernetItem()
+{
+}
+
+void
+EthernetItem::setAutoConnect(bool autoConnect)
+{
+    d->m_actionConnected->setState(TypedVariant<bool>(autoConnect));
+}
+
+void
+EthernetItem::setStatusText(const QString &value)
+{
+    d->m_actionStatusLabel->setState(TypedVariant<string>(value.toStdString()));
+}
+
+void
+EthernetItem::setName(const QString &value)
+{
+    d->m_item->setLabel(value);
+}
+
+MenuItem::Ptr
+EthernetItem::menuItem()
+{
+    return d->m_item;
+}
+
+#include "ethernet-item.moc"

=== added file 'src/indicator/menuitems/ethernet-item.h'
--- src/indicator/menuitems/ethernet-item.h	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-item.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include "item.h"
+#include "menumodel-cpp/action.h"
+#include "menumodel-cpp/menu-item.h"
+#include "menumodel-cpp/gio-helpers/variant.h"
+
+#include <functional>
+#include <vector>
+
+class EthernetItem : public Item
+{
+    Q_OBJECT
+
+    class Private;
+    std::unique_ptr<Private> d;
+
+public:
+    typedef std::shared_ptr<EthernetItem> Ptr;
+
+    EthernetItem(unsigned int id);
+    virtual ~EthernetItem();
+
+    virtual MenuItem::Ptr menuItem();
+
+public Q_SLOTS:
+    void setStatusText(const QString &value);
+
+    void setName(const QString &value);
+
+    void setAutoConnect(bool autoConnect);
+
+Q_SIGNALS:
+    void autoConnectChanged(bool autoconnect);
+};

=== added file 'src/indicator/menuitems/ethernet-link-item.cpp'
--- src/indicator/menuitems/ethernet-link-item.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-link-item.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <menuitems/ethernet-item.h>
+#include <util/localisation.h>
+#include <icons.h>
+#include <menuitems/ethernet-link-item.h>
+
+#include <QDebug>
+
+using namespace std;
+using namespace nmofono;
+using namespace nmofono::ethernet;
+
+class EthernetLinkItem::Private: public QObject
+{
+    Q_OBJECT
+
+public Q_SLOTS:
+    void
+    statusUpdated(Link::Status status)
+    {
+        const static QMap<Link::Status, QString> statusMap{
+            {Link::Status::connected, _("Connected")},
+            {Link::Status::connecting, _("Connecting")},
+            {Link::Status::disabled, _("Disabled")},
+            {Link::Status::offline, _("Disconnected")},
+            {Link::Status::online, _("Online")},
+            {Link::Status::failed, _("Failed")},
+        };
+
+        m_item->setStatusText(statusMap[status]);
+    }
+
+    void
+    updateIdentifierText()
+    {
+        if (m_showInterface)
+        {
+            m_item->setName(
+                    QString(_("Ethernet (%1)")).arg(m_ethernetLink->name()));
+        }
+        else
+        {
+            m_item->setName(QString(_("Ethernet")));
+        }
+    }
+
+public:
+    EthernetLink::SPtr m_ethernetLink;
+
+    EthernetItem::Ptr m_item;
+
+    bool m_showInterface = true;
+};
+
+EthernetLinkItem::EthernetLinkItem(EthernetLink::SPtr ethernetLink) :
+        d(new Private)
+{
+    d->m_ethernetLink = ethernetLink;
+
+    d->m_item = make_shared<EthernetItem>(ethernetLink->id());
+
+    m_actionGroupMerger->add(d->m_item->actionGroup());
+
+    connect(d->m_ethernetLink.get(), &Link::statusUpdated, d.get(),
+            &Private::statusUpdated);
+    d->statusUpdated(d->m_ethernetLink->status());
+
+    connect(d->m_ethernetLink.get(), &Link::nameUpdated, d.get(),
+            &Private::updateIdentifierText);
+    d->updateIdentifierText();
+
+    connect(d->m_ethernetLink.get(), &EthernetLink::autoConnectChanged,
+            d->m_item.get(), &EthernetItem::setAutoConnect);
+    connect(d->m_item.get(), &EthernetItem::autoConnectChanged,
+            d->m_ethernetLink.get(), &EthernetLink::setAutoConnect);
+    d->m_item->setAutoConnect(d->m_ethernetLink->autoConnect());
+}
+
+MenuItem::Ptr
+EthernetLinkItem::menuItem()
+{
+    return d->m_item->menuItem();
+}
+
+void
+EthernetLinkItem::setShowInterface(bool showInterface)
+{
+    d->m_showInterface = showInterface;
+    d->updateIdentifierText();
+}
+
+#include "ethernet-link-item.moc"

=== added file 'src/indicator/menuitems/ethernet-link-item.h'
--- src/indicator/menuitems/ethernet-link-item.h	1970-01-01 00:00:00 +0000
+++ src/indicator/menuitems/ethernet-link-item.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <menuitems/item.h>
+#include <nmofono/ethernet/ethernet-link.h>
+
+#include <unity/util/DefinesPtrs.h>
+
+class EthernetLinkItem : public Item
+{
+    class Private;
+    std::shared_ptr<Private> d;
+
+public:
+    UNITY_DEFINES_PTRS(EthernetLinkItem);
+
+    EthernetLinkItem(nmofono::ethernet::EthernetLink::SPtr link);
+    ~EthernetLinkItem() = default;
+
+    MenuItem::Ptr menuItem() override;
+
+    void setShowInterface(bool);
+};

=== modified file 'src/indicator/menuitems/section.h'
--- src/indicator/menuitems/section.h	2015-04-24 08:47:08 +0000
+++ src/indicator/menuitems/section.h	2016-12-05 18:14:38 +0000
@@ -23,6 +23,8 @@
 #include "menumodel-cpp/action-group.h"
 #include "menumodel-cpp/menu-model.h"
 
+#include <unity/util/DefinesPtrs.h>
+
 class Section
 {
 public:

=== modified file 'src/indicator/menuitems/wifi-link-item.cpp'
--- src/indicator/menuitems/wifi-link-item.cpp	2015-10-06 10:14:57 +0000
+++ src/indicator/menuitems/wifi-link-item.cpp	2016-12-05 18:14:38 +0000
@@ -42,7 +42,7 @@
 public:
     ActionGroupMerger::Ptr m_actionGroupMerger;
 
-    wifi::WifiLink::Ptr m_link;
+    wifi::WifiLink::SPtr m_link;
 
     /// @todo do something with me...
     Action::Ptr m_actionBusy;
@@ -73,7 +73,7 @@
 
     Private() = delete;
     ~Private() {}
-    Private(wifi::WifiLink::Ptr link)
+    Private(wifi::WifiLink::SPtr link)
         : m_link {link}
     {
         m_actionGroupMerger = std::make_shared<ActionGroupMerger>();
@@ -196,7 +196,7 @@
 };
 
 
-WifiLinkItem::WifiLinkItem(wifi::WifiLink::Ptr link)
+WifiLinkItem::WifiLinkItem(wifi::WifiLink::SPtr link)
     : d{new Private(link)}
 {
 }

=== modified file 'src/indicator/menuitems/wifi-link-item.h'
--- src/indicator/menuitems/wifi-link-item.h	2015-04-24 08:47:08 +0000
+++ src/indicator/menuitems/wifi-link-item.h	2016-12-05 18:14:38 +0000
@@ -31,7 +31,7 @@
 public:
     typedef std::shared_ptr<WifiLinkItem> Ptr;
 
-    WifiLinkItem(nmofono::wifi::WifiLink::Ptr link);
+    WifiLinkItem(nmofono::wifi::WifiLink::SPtr link);
     virtual ~WifiLinkItem();
 
     virtual MenuItem::Ptr menuItem();

=== modified file 'src/indicator/menuitems/wwan-link-item.h'
--- src/indicator/menuitems/wwan-link-item.h	2015-04-24 08:47:08 +0000
+++ src/indicator/menuitems/wwan-link-item.h	2016-12-05 18:14:38 +0000
@@ -28,7 +28,8 @@
     std::shared_ptr<Private> d;
 
 public:
-    typedef std::shared_ptr<WwanLinkItem> Ptr;
+    UNITY_DEFINES_PTRS(WwanLinkItem);
+
     WwanLinkItem(nmofono::wwan::Modem::Ptr, nmofono::Manager::Ptr manager);
     virtual ~WwanLinkItem();
 

=== modified file 'src/indicator/nmofono/connection/active-connection-manager.cpp'
--- src/indicator/nmofono/connection/active-connection-manager.cpp	2016-05-26 13:51:39 +0000
+++ src/indicator/nmofono/connection/active-connection-manager.cpp	2016-12-05 18:14:38 +0000
@@ -109,6 +109,11 @@
     return d->m_connections.values().toSet();
 }
 
+ActiveConnection::SPtr ActiveConnectionManager::connection(const QDBusObjectPath& path) const
+{
+    return d->m_connections.value(path);
+}
+
 bool ActiveConnectionManager::deactivate(ActiveConnection::SPtr activeConnection)
 {
     auto reply = d->m_manager->DeactivateConnection(activeConnection->path());

=== modified file 'src/indicator/nmofono/connection/active-connection-manager.h'
--- src/indicator/nmofono/connection/active-connection-manager.h	2015-10-06 10:19:30 +0000
+++ src/indicator/nmofono/connection/active-connection-manager.h	2016-12-05 18:14:38 +0000
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <QDBusObjectPath>
 #include <QObject>
 #include <QSet>
 
@@ -41,6 +42,8 @@
 
     QSet<ActiveConnection::SPtr> connections() const;
 
+    ActiveConnection::SPtr connection(const QDBusObjectPath& path) const;
+
     bool deactivate(ActiveConnection::SPtr activeConnection);
 
 Q_SIGNALS:

=== modified file 'src/indicator/nmofono/connection/active-connection.cpp'
--- src/indicator/nmofono/connection/active-connection.cpp	2015-12-17 10:41:14 +0000
+++ src/indicator/nmofono/connection/active-connection.cpp	2016-12-05 18:14:38 +0000
@@ -62,6 +62,10 @@
             {
                 setConnectionPath(qvariant_cast<QDBusObjectPath>(value));
             }
+            else if (property == "SpecificObject")
+            {
+                setSpecificObject(qvariant_cast<QDBusObjectPath>(value));
+            }
         }
     }
 
@@ -121,6 +125,17 @@
         Q_EMIT p.connectionPathChanged(m_connectionPath);
     }
 
+    void setSpecificObject(const QDBusObjectPath& specificObject)
+    {
+        if (specificObject == m_specificObject)
+        {
+            return;
+        }
+
+        m_specificObject = specificObject;
+        Q_EMIT p.specificObjectChanged(m_specificObject);
+    }
+
 public:
     ActiveConnection& p;
 
@@ -128,6 +143,8 @@
 
     ActiveVpnConnection::SPtr m_activeVpnConnection;
 
+    QString m_uuid;
+
     QString m_id;
 
     QString m_type;
@@ -135,6 +152,8 @@
     State m_state = State::unknown;
 
     QDBusObjectPath m_connectionPath;
+
+    QDBusObjectPath m_specificObject;
 };
 
 ActiveConnection::ActiveConnection(const QDBusObjectPath& path, const QDBusConnection& systemConnection) :
@@ -142,10 +161,12 @@
 {
     d->m_activeConnection = make_shared<OrgFreedesktopNetworkManagerConnectionActiveInterface>(NM_DBUS_SERVICE, path.path(), systemConnection);
 
+    d->m_uuid = d->m_activeConnection->uuid();
     d->setId(d->m_activeConnection->id());
     d->setType(d->m_activeConnection->type());
     d->setState(static_cast<State>(d->m_activeConnection->state()));
     d->setConnectionPath(d->m_activeConnection->connection());
+    d->setSpecificObject(d->m_activeConnection->specificObject());
 
     connect(d->m_activeConnection.get(), &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d.get(), &Priv::propertiesChanged);
 }
@@ -155,6 +176,11 @@
     return d->m_id;
 }
 
+QString ActiveConnection::uuid() const
+{
+    return d->m_uuid;
+}
+
 QString ActiveConnection::type() const
 {
     return d->m_type;
@@ -170,6 +196,11 @@
     return d->m_connectionPath;
 }
 
+QDBusObjectPath ActiveConnection::specificObject() const
+{
+    return d->m_specificObject;
+}
+
 QDBusObjectPath ActiveConnection::path() const
 {
     return QDBusObjectPath(d->m_activeConnection->path());

=== modified file 'src/indicator/nmofono/connection/active-connection.h'
--- src/indicator/nmofono/connection/active-connection.h	2015-12-17 10:41:14 +0000
+++ src/indicator/nmofono/connection/active-connection.h	2016-12-05 18:14:38 +0000
@@ -54,12 +54,16 @@
 
     QString id() const;
 
+    QString uuid() const;
+
     QString type() const;
 
     State state() const;
 
     QDBusObjectPath connectionPath() const;
 
+    QDBusObjectPath specificObject() const;
+
     QDBusObjectPath path() const;
 
     ActiveVpnConnection::SPtr vpnConnection() const;
@@ -73,6 +77,8 @@
 
     void connectionPathChanged(const QDBusObjectPath& connectionPath);
 
+    void specificObjectChanged(const QDBusObjectPath& specificObject);
+
 protected:
     class Priv;
     std::shared_ptr<Priv> d;

=== added file 'src/indicator/nmofono/connection/available-connection.cpp'
--- src/indicator/nmofono/connection/available-connection.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/connection/available-connection.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <nmofono/connection/available-connection.h>
+#include <NetworkManagerSettingsConnectionInterface.h>
+
+using namespace std;
+
+namespace nmofono
+{
+namespace connection
+{
+
+class AvailableConnection::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(AvailableConnection& parent) :
+        p(parent)
+    {
+    }
+
+public Q_SLOTS:
+    void updated()
+    {
+        QVariantDictMap settings = m_connectionInterface->GetSettings();
+
+        auto connection = settings.value("connection");
+        m_connectionUuid = connection.value("uuid").toString();
+        setConnectionId(connection.value("id").toString());
+    }
+
+    void setConnectionId(const QString& connectionId)
+    {
+        if (connectionId == m_connectionId)
+        {
+            return;
+        }
+
+        m_connectionId = connectionId;
+        Q_EMIT p.connectionIdChanged(m_connectionId);
+    }
+
+public:
+    AvailableConnection& p;
+
+    shared_ptr<OrgFreedesktopNetworkManagerSettingsConnectionInterface> m_connectionInterface;
+
+    QString m_connectionUuid;
+
+    QString m_connectionId;
+};
+
+AvailableConnection::AvailableConnection(const QDBusObjectPath& path, const QDBusConnection& systemConnection) :
+        d(new Priv(*this))
+{
+    d->m_connectionInterface = make_shared<OrgFreedesktopNetworkManagerSettingsConnectionInterface>(NM_DBUS_SERVICE, path.path(), systemConnection);
+    connect(d->m_connectionInterface.get(), &OrgFreedesktopNetworkManagerSettingsConnectionInterface::Updated, d.get(), &Priv::updated);
+    d->updated();
+}
+
+QDBusObjectPath AvailableConnection::path() const
+{
+    return QDBusObjectPath(d->m_connectionInterface->path());
+}
+
+QString AvailableConnection::connectionUuid() const
+{
+    return d->m_connectionUuid;
+}
+
+QString AvailableConnection::connectionId() const
+{
+    return d->m_connectionId;
+}
+
+}
+}
+
+#include "available-connection.moc"

=== added file 'src/indicator/nmofono/connection/available-connection.h'
--- src/indicator/nmofono/connection/available-connection.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/connection/available-connection.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QObject>
+
+#include <unity/util/DefinesPtrs.h>
+#include <NetworkManager.h>
+
+namespace nmofono
+{
+namespace ethernet
+{
+class EthernetLink;
+}
+
+namespace connection
+{
+
+class AvailableConnection: public QObject
+{
+    Q_OBJECT
+
+public:
+    UNITY_DEFINES_PTRS(AvailableConnection);
+
+    AvailableConnection(const QDBusObjectPath& path, const QDBusConnection& systemConnection);
+
+    ~AvailableConnection() = default;
+
+    QDBusObjectPath path() const;
+
+    QString connectionId() const;
+
+    QString connectionUuid() const;
+
+Q_SIGNALS:
+    void connectionIdChanged(const QString &);
+
+    void connectionUuidChanged(const QString &);
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+
+    friend ethernet::EthernetLink;
+};
+
+}
+}

=== added directory 'src/indicator/nmofono/ethernet'
=== added file 'src/indicator/nmofono/ethernet/ethernet-link.cpp'
--- src/indicator/nmofono/ethernet/ethernet-link.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/ethernet/ethernet-link.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,379 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <nmofono/connection/available-connection.h>
+#include <nmofono/ethernet/ethernet-link.h>
+#include <util/dbus-property-cache.h>
+#include <util/localisation.h>
+
+#include <NetworkManagerDeviceWiredInterface.h>
+
+#include <NetworkManager.h>
+#include <iostream>
+
+using namespace std;
+using namespace nmofono;
+using namespace nmofono::connection;
+
+namespace nmofono
+{
+namespace ethernet
+{
+
+struct EthernetLink::Private : public QObject
+{
+Q_OBJECT
+
+public:
+    Private(EthernetLink& parent) :
+            p(parent)
+    {
+    }
+
+public Q_SLOTS:
+    void
+    updateStatus(uint new_state, uint, uint)
+    {
+        Status status = Status::disabled;
+
+        switch (new_state)
+        {
+            case NM_DEVICE_STATE_DISCONNECTED:
+            case NM_DEVICE_STATE_DEACTIVATING:
+            case NM_DEVICE_STATE_UNMANAGED:
+            case NM_DEVICE_STATE_UNAVAILABLE:
+                status = Status::offline;
+                break;
+            case NM_DEVICE_STATE_UNKNOWN:
+            case NM_DEVICE_STATE_FAILED:
+                status = Status::failed;
+                break;
+            case NM_DEVICE_STATE_PREPARE:
+            case NM_DEVICE_STATE_CONFIG:
+            case NM_DEVICE_STATE_NEED_AUTH:
+            case NM_DEVICE_STATE_IP_CONFIG:
+            case NM_DEVICE_STATE_IP_CHECK:
+                status = Status::connecting;
+                break;
+            case NM_DEVICE_STATE_SECONDARIES:
+            case NM_DEVICE_STATE_ACTIVATED:
+                status = Status::connected;
+                break;
+        }
+
+        setStatus(status);
+
+        updateActiveConnection();
+    }
+
+    void
+    updateAvailableConnections()
+    {
+        auto availableConnectionPaths = m_dev->availableConnections().toSet();
+        auto current(m_availableConnections.keys().toSet());
+
+        auto toRemove(current);
+        toRemove.subtract(availableConnectionPaths);
+
+        auto toAdd(availableConnectionPaths);
+        toAdd.subtract(current);
+
+        if (toAdd.isEmpty() && toRemove.isEmpty())
+        {
+            return;
+        }
+
+        for (auto connectionPath : toRemove)
+        {
+            m_availableConnections.take(connectionPath);
+        }
+
+        for (auto connectionPath : toAdd)
+        {
+            m_availableConnections[connectionPath] = make_shared<AvailableConnection>(connectionPath, m_dev->connection());
+        }
+
+        if (m_preferredConnection)
+        {
+            if (!m_availableConnections.contains(m_preferredConnection->path()))
+            {
+                setPreferredConnection(AvailableConnection::SPtr());
+            }
+        }
+
+        Q_EMIT p.availableConnectionsChanged();
+    }
+
+    void
+    updateActiveConnection()
+    {
+        auto activeConnectionPath = m_dev->activeConnection();
+        auto activeConnection = m_connectionManager->connection(activeConnectionPath);
+
+        bool foundActiveConnection = false;
+        if (activeConnection)
+        {
+            for (QMapIterator<QDBusObjectPath, AvailableConnection::SPtr> it(m_availableConnections); it.hasNext();)
+            {
+                it.next();
+
+                auto availableConnection(it.value());
+                if (availableConnection->connectionUuid() == activeConnection->uuid())
+                {
+                    setPreferredConnection(availableConnection);
+                    foundActiveConnection = true;
+                }
+            }
+        }
+
+        // If we couldn't find an active connection, we'll have to fall back to the first available one.
+        if (!m_preferredConnection && !foundActiveConnection && !m_availableConnections.isEmpty())
+        {
+            setPreferredConnection(m_availableConnections.first());
+        }
+    }
+
+    void
+    setPreferredConnection(AvailableConnection::SPtr availableConnection)
+    {
+        if (m_preferredConnection == availableConnection)
+        {
+            return;
+        }
+
+        m_preferredConnection = availableConnection;
+        Q_EMIT p.preferredConnectionChanged(m_preferredConnection);
+    }
+
+    void
+    setName(const QString& name)
+    {
+        if (m_name == name)
+        {
+            return;
+        }
+
+        m_name = name;
+        Q_EMIT p.nameUpdated(m_name);
+    }
+
+    void
+    setStatus(Status status)
+    {
+        if (m_status == status)
+        {
+            return;
+        }
+
+        m_status = status;
+        Q_EMIT p.statusUpdated(m_status);
+    }
+
+    void
+    setAutoConnect(bool autoConnect)
+    {
+        if (m_autoConnect == autoConnect)
+        {
+            return;
+        }
+
+        m_autoConnect = autoConnect;
+        Q_EMIT p.autoConnectChanged(m_autoConnect);
+    }
+
+    void
+    devicePropertyChanged(const QString& name, const QVariant& value)
+    {
+        if (name == "Autoconnect")
+        {
+            setAutoConnect(value.toBool());
+        }
+    }
+
+public:
+    EthernetLink& p;
+
+    shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> m_dev;
+
+    shared_ptr<OrgFreedesktopNetworkManagerInterface> m_nm;
+
+    shared_ptr<OrgFreedesktopNetworkManagerSettingsInterface> m_settings;
+
+    shared_ptr<OrgFreedesktopNetworkManagerDeviceWiredInterface> m_wired;
+
+    shared_ptr<util::DBusPropertyCache> m_devicePropertyCache;
+
+    ActiveConnectionManager::SPtr m_connectionManager;
+
+    QMap<QDBusObjectPath, AvailableConnection::SPtr> m_availableConnections;
+
+    AvailableConnection::SPtr m_preferredConnection;
+
+    QString m_name;
+
+    Id m_id = 0;
+
+    Status m_status = Status::disabled;
+
+    bool m_autoConnect = false;
+};
+
+EthernetLink::EthernetLink(shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> dev, shared_ptr<OrgFreedesktopNetworkManagerInterface> nm, shared_ptr<OrgFreedesktopNetworkManagerSettingsInterface> settings, ActiveConnectionManager::SPtr connectionManager) :
+        d(new Private(*this))
+{
+    d->m_dev = dev;
+    d->m_nm = nm;
+    d->m_settings = settings;
+    d->m_connectionManager = connectionManager;
+    d->m_devicePropertyCache = make_shared<util::DBusPropertyCache>(NM_DBUS_SERVICE, NM_DBUS_INTERFACE_DEVICE, dev->path(), dev->connection());
+    connect(d->m_devicePropertyCache.get(), &util::DBusPropertyCache::propertyChanged, d.get(), &Private::devicePropertyChanged);
+
+    d->m_wired = make_shared<OrgFreedesktopNetworkManagerDeviceWiredInterface>(NM_DBUS_SERVICE, dev->path(), dev->connection());
+
+    // This regular expression extracts the number from the end of the DBus path
+    static QRegularExpression re("^[^\\d]+(\\d+)$");
+    auto match = re.match(d->m_dev->path());
+    d->m_id = match.captured(1).toUInt();
+    d->setName(d->m_dev->interface());
+
+    connect(d->m_dev.get(), &OrgFreedesktopNetworkManagerDeviceInterface::StateChanged, d.get(), &Private::updateStatus);
+    connect(d->m_connectionManager.get(), &ActiveConnectionManager::connectionsChanged, d.get(), &Private::updateActiveConnection);
+    connect(d->m_settings.get(), &OrgFreedesktopNetworkManagerSettingsInterface::ConnectionRemoved, d.get(), &Private::updateAvailableConnections);
+    connect(d->m_settings.get(), &OrgFreedesktopNetworkManagerSettingsInterface::NewConnection, d.get(), &Private::updateAvailableConnections);
+
+    d->updateAvailableConnections();
+    d->updateStatus(d->m_dev->state(), 0, 0);
+    d->setAutoConnect(d->m_devicePropertyCache->get("Autoconnect").toBool());
+}
+
+EthernetLink::~EthernetLink()
+{
+}
+
+Link::Type
+EthernetLink::type() const
+{
+    return Type::ethernet;
+}
+
+uint32_t
+EthernetLink::characteristics() const
+{
+    return Characteristics::empty;
+}
+
+Link::Status
+EthernetLink::status() const
+{
+    return d->m_status;
+}
+
+Link::Id
+EthernetLink::id() const
+{
+    return d->m_id;
+}
+
+QString
+EthernetLink::name() const
+{
+    return d->m_name;
+}
+
+QList<AvailableConnection::SPtr>
+EthernetLink::availableConnections() const
+{
+    return d->m_availableConnections.values();
+}
+
+AvailableConnection::SPtr
+EthernetLink::preferredConnection() const
+{
+    return d->m_preferredConnection;
+}
+
+bool
+EthernetLink::autoConnect() const
+{
+    return d->m_autoConnect;
+}
+
+void
+EthernetLink::setAutoConnect(bool autoConnect)
+{
+    if (autoConnect)
+    {
+        if (d->m_preferredConnection)
+        {
+            auto reply = d->m_nm->ActivateConnection(d->m_preferredConnection->path(), QDBusObjectPath(d->m_dev->path()), QDBusObjectPath("/"));
+            reply.waitForFinished();
+            if (reply.isError())
+            {
+                qWarning() << reply.error().message();
+            }
+        }
+        d->m_dev->setAutoconnect(true);
+    }
+    else
+    {
+        d->m_dev->setAutoconnect(false);
+        auto reply = d->m_dev->Disconnect();
+        reply.waitForFinished();
+        if (reply.isError())
+        {
+            qWarning() << reply.error().message();
+        }
+    }
+
+    Q_EMIT autoConnectChanged(autoConnect);
+}
+
+void
+EthernetLink::setPreferredConnection(AvailableConnection::SPtr preferredConnection)
+{
+    if (d->m_preferredConnection == preferredConnection)
+    {
+        return;
+    }
+
+    d->m_preferredConnection = preferredConnection;
+
+    if (d->m_autoConnect && preferredConnection)
+    {
+        auto reply = d->m_nm->ActivateConnection(d->m_preferredConnection->path(), QDBusObjectPath(d->m_dev->path()), QDBusObjectPath("/"));
+        reply.waitForFinished();
+        if (reply.isError())
+        {
+            qWarning() << reply.error().message();
+        }
+    }
+
+    Q_EMIT preferredConnectionChanged(preferredConnection);
+}
+
+QDBusObjectPath
+EthernetLink::devicePath() const
+{
+    return QDBusObjectPath(d->m_dev->path());
+}
+
+}
+}
+
+#include "ethernet-link.moc"

=== added file 'src/indicator/nmofono/ethernet/ethernet-link.h'
--- src/indicator/nmofono/ethernet/ethernet-link.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/ethernet/ethernet-link.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <nmofono/link.h>
+#include <nmofono/connection/active-connection-manager.h>
+#include <nmofono/connection/available-connection.h>
+#include <NetworkManagerInterface.h>
+#include <NetworkManagerSettingsInterface.h>
+#include <NetworkManagerDeviceInterface.h>
+
+#include <unity/util/DefinesPtrs.h>
+
+#include <QSet>
+
+namespace nmofono {
+namespace ethernet {
+
+#ifndef CONNECTIVITY_CPP_EXPORT
+#define CONNECTIVITY_CPP_EXPORT __attribute ((visibility ("default")))
+#endif
+
+class CONNECTIVITY_CPP_EXPORT
+EthernetLink : public Link
+{
+    Q_OBJECT
+
+public:
+    UNITY_DEFINES_PTRS(EthernetLink);
+
+    EthernetLink(std::shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> dev,
+                 std::shared_ptr<OrgFreedesktopNetworkManagerInterface> nm,
+                 std::shared_ptr<OrgFreedesktopNetworkManagerSettingsInterface> settings,
+                 nmofono::connection::ActiveConnectionManager::SPtr connectionManager);
+
+    EthernetLink() = delete;
+    EthernetLink(const EthernetLink&) = delete;
+    ~EthernetLink();
+
+    Type type() const;
+
+    std::uint32_t characteristics() const;
+
+    Status status() const;
+
+    Id id() const;
+
+    QString name() const;
+
+    QList<connection::AvailableConnection::SPtr> availableConnections() const;
+
+    connection::AvailableConnection::SPtr preferredConnection() const;
+
+    bool autoConnect() const;
+
+    QDBusObjectPath devicePath() const;
+
+public Q_SLOTS:
+    void setPreferredConnection(connection::AvailableConnection::SPtr availableConnection);
+
+    void setAutoConnect(bool autoConnect);
+
+Q_SIGNALS:
+    void availableConnectionsChanged();
+
+    void preferredConnectionChanged(connection::AvailableConnection::SPtr availableConnection);
+
+    void autoConnectChanged(bool autoconnect);
+
+protected:
+    class Private;
+    std::shared_ptr<Private> d;
+};
+
+}
+}

=== modified file 'src/indicator/nmofono/link.h'
--- src/indicator/nmofono/link.h	2015-08-05 15:14:28 +0000
+++ src/indicator/nmofono/link.h	2016-12-05 18:14:38 +0000
@@ -22,6 +22,8 @@
 #include <memory>
 #include <QObject>
 
+#include <unity/util/DefinesPtrs.h>
+
 namespace nmofono {
 
 #ifndef CONNECTIVITY_CPP_EXPORT
@@ -34,7 +36,7 @@
     Q_OBJECT
 
 public:
-    typedef std::shared_ptr<Link> Ptr;
+    UNITY_DEFINES_PTRS(Link);
 
     Link(const Link&) = delete;
     virtual ~Link() = default;
@@ -45,6 +47,7 @@
     /// @private
     enum class Type
     {
+        ethernet,
         wifi,
         wired,
         wwan,
@@ -60,7 +63,8 @@
         connected,   // the link is up, but not fully configured yet
                      // happens with wifi for example when captive portal
                      // login is required
-        online
+        online,
+        failed
     };
 
     /**
@@ -116,6 +120,8 @@
 
     void statusUpdated(Status);
 
+    void nameUpdated(const QString& name);
+
 protected:
     /// @private
     Link() = default;

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2016-10-30 15:13:34 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2016-12-05 18:14:38 +0000
@@ -20,13 +20,10 @@
 
 #include <nmofono/manager-impl.h>
 #include <nmofono/connectivity-service-settings.h>
+#include <nmofono/ethernet/ethernet-link.h>
 #include <nmofono/wifi/wifi-link-impl.h>
 #include <nmofono/wwan/sim-manager.h>
-#include <NetworkManagerActiveConnectionInterface.h>
-#include <NetworkManagerDeviceInterface.h>
 #include <NetworkManagerInterface.h>
-#include <NetworkManagerSettingsInterface.h>
-#include <NetworkManagerSettingsConnectionInterface.h>
 
 #define slots
 #include <qofono-qt5/qofonomanager.h>
@@ -61,7 +58,9 @@
     Manager& p;
 
     shared_ptr<OrgFreedesktopNetworkManagerInterface> nm;
+    shared_ptr<OrgFreedesktopNetworkManagerSettingsInterface> m_settingsInterface;
     shared_ptr<QOfonoManager> m_ofono;
+    connection::ActiveConnectionManager::SPtr m_activeConnectionManager;
 
     bool m_flightMode = true;
     bool m_unstoppableOperationHappening = false;
@@ -76,7 +75,7 @@
 
     QList<QDBusObjectPath> m_nmDevices;
 
-    QSet<Link::Ptr> m_nmLinks;
+    QSet<Link::SPtr> m_nmLinks;
     QMap<QString, wwan::Modem::Ptr> m_ofonoLinks;
 
     SimUnlockDialog::Ptr m_unlockDialog;
@@ -527,10 +526,14 @@
 ManagerImpl::ManagerImpl(notify::NotificationManager::SPtr notificationManager,
                          KillSwitch::Ptr killSwitch,
                          HotspotManager::SPtr hotspotManager,
+                         connection::ActiveConnectionManager::SPtr activeConnectionManager,
                          const QDBusConnection& systemConnection) :
         d(new ManagerImpl::Private(*this))
 {
     d->nm = make_shared<OrgFreedesktopNetworkManagerInterface>(NM_DBUS_SERVICE, NM_DBUS_PATH, systemConnection);
+    d->m_settingsInterface = make_shared<OrgFreedesktopNetworkManagerSettingsInterface>(
+                    NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, systemConnection);
+    d->m_activeConnectionManager = activeConnectionManager;
 
     d->m_unlockDialog = make_shared<SimUnlockDialog>(notificationManager);
     connect(d->m_unlockDialog.get(), &SimUnlockDialog::ready, d.get(), &Private::sim_unlock_ready);
@@ -720,7 +723,7 @@
 
     d->m_statisticsMonitor->remove(path.path());
 
-    Link::Ptr toRemove;
+    Link::SPtr toRemove;
     for (auto dev : d->m_nmLinks)
     {
         auto wifiLink = dynamic_pointer_cast<wifi::WifiLinkImpl>(dev);
@@ -754,41 +757,55 @@
         }
     }
 
-    Link::Ptr link;
+    Link::SPtr link;
     try {
         auto dev = make_shared<OrgFreedesktopNetworkManagerDeviceInterface>(
             NM_DBUS_SERVICE, path.path(), d->nm->connection());
-        if (dev->deviceType() == NM_DEVICE_TYPE_WIFI) {
-            wifi::WifiLink::Ptr tmp = make_shared<wifi::WifiLinkImpl>(dev,
-                                                d->nm,
-                                                d->m_killSwitch);
-
-            // We're not interested in showing access points
-            if (tmp->name() != d->m_hotspotManager->interface())
-            {
-                tmp->setDisconnectWifi(d->m_hotspotManager->disconnectWifi());
-                QObject::connect(d->m_hotspotManager.get(), &HotspotManager::disconnectWifiChanged,
-                        tmp.get(), &wifi::WifiLink::setDisconnectWifi);
-
-                link = tmp;
-            }
-        }
-        else if (dev->deviceType() == NM_DEVICE_TYPE_MODEM)
+        switch (dev->deviceType())
         {
-            if (dev->driver() == "ofono")
-            {
-                for (const auto &modem : d->m_ofonoLinks)
-                {
-                    if (modem->ofonoPath() == dev->udi())
+            case NM_DEVICE_TYPE_WIFI:
+            {
+                wifi::WifiLink::SPtr tmp = make_shared<wifi::WifiLinkImpl>(dev,
+                                                    d->nm,
+                                                    d->m_killSwitch,
+                                                    d->m_activeConnectionManager);
+
+                // We're not interested in showing access points
+                if (tmp->name() != d->m_hotspotManager->interface())
+                {
+                    tmp->setDisconnectWifi(d->m_hotspotManager->disconnectWifi());
+                    QObject::connect(d->m_hotspotManager.get(), &HotspotManager::disconnectWifiChanged,
+                            tmp.get(), &wifi::WifiLink::setDisconnectWifi);
+
+                    link = tmp;
+                }
+                break;
+            }
+            case NM_DEVICE_TYPE_ETHERNET:
+            {
+                link = make_shared<ethernet::EthernetLink>(
+                        dev, d->nm, d->m_settingsInterface, d->m_activeConnectionManager);
+                break;
+            }
+            case NM_DEVICE_TYPE_MODEM:
+            {
+                if (dev->driver() == "ofono")
+                {
+                    for (const auto &modem : d->m_ofonoLinks)
                     {
-                        modem->setNmPath(path.path());
-                        d->m_statisticsMonitor->addLink(modem);
-                        break;
+                        if (modem->ofonoPath() == dev->udi())
+                        {
+                            modem->setNmPath(path.path());
+                            d->m_statisticsMonitor->addLink(modem);
+                            break;
+                        }
                     }
                 }
+                break;
             }
+            default:
+                break;
         }
-
     } catch (const exception &e) {
         qDebug() << ": failed to create Device proxy for "<< path.path() << ": ";
         qDebug() << "\t" << e.what();
@@ -813,10 +830,10 @@
     return d->m_unstoppableOperationHappening;
 }
 
-QSet<Link::Ptr>
+QSet<Link::SPtr>
 ManagerImpl::links() const
 {
-    QSet<Link::Ptr> result(d->m_nmLinks);
+    QSet<Link::SPtr> result(d->m_nmLinks);
     for(auto i: d->m_ofonoLinks)
     {
         result.insert(i);
@@ -917,10 +934,10 @@
 }
 
 
-QSet<wifi::WifiLink::Ptr>
+QSet<wifi::WifiLink::SPtr>
 ManagerImpl::wifiLinks() const
 {
-    QSet<wifi::WifiLink::Ptr> result;
+    QSet<wifi::WifiLink::SPtr> result;
     for(auto link: d->m_nmLinks)
     {
         if (link->type() == Link::Type::wifi)
@@ -931,6 +948,20 @@
     return result;
 }
 
+QSet<ethernet::EthernetLink::SPtr>
+ManagerImpl::ethernetLinks() const
+{
+    QSet<ethernet::EthernetLink::SPtr> result;
+    for(auto link: d->m_nmLinks)
+    {
+        if (link->type() == Link::Type::ethernet)
+        {
+            result.insert(dynamic_pointer_cast<ethernet::EthernetLink>(link));
+        }
+    }
+    return result;
+}
+
 QSet<wwan::Modem::Ptr>
 ManagerImpl::modemLinks() const
 {

=== modified file 'src/indicator/nmofono/manager-impl.h'
--- src/indicator/nmofono/manager-impl.h	2016-10-29 20:09:30 +0000
+++ src/indicator/nmofono/manager-impl.h	2016-12-05 18:14:38 +0000
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <nmofono/connection/active-connection-manager.h>
 #include <nmofono/manager.h>
 #include <nmofono/kill-switch.h>
 #include <nmofono/hotspot-manager.h>
@@ -51,6 +52,7 @@
             std::shared_ptr<notify::NotificationManager> notificationManager,
             KillSwitch::Ptr killSwitch,
             HotspotManager::SPtr hotspotManager,
+            connection::ActiveConnectionManager::SPtr activeConnectionManager,
             const QDBusConnection& systemBus);
 
     // Public API
@@ -66,8 +68,9 @@
 
     bool roaming() const override;
 
-    QSet<Link::Ptr> links() const override;
-    QSet<wifi::WifiLink::Ptr> wifiLinks() const override;
+    QSet<Link::SPtr> links() const override;
+    QSet<wifi::WifiLink::SPtr> wifiLinks() const override;
+    QSet<ethernet::EthernetLink::SPtr> ethernetLinks() const override;
     QSet<wwan::Modem::Ptr> modemLinks() const override;
 
     Manager::NetworkingStatus status() const override;

=== modified file 'src/indicator/nmofono/manager.h'
--- src/indicator/nmofono/manager.h	2016-10-29 20:09:30 +0000
+++ src/indicator/nmofono/manager.h	2016-12-05 18:14:38 +0000
@@ -21,6 +21,7 @@
 
 #include <nmofono/hotspot-manager.h>
 #include <nmofono/link.h>
+#include <nmofono/ethernet/ethernet-link.h>
 #include <nmofono/wifi/wifi-link.h>
 #include <nmofono/wwan/modem.h>
 #include <nmofono/wwan/sim.h>
@@ -83,10 +84,12 @@
     virtual bool unstoppableOperationHappening() const = 0;
 
     /// @private
-    Q_PROPERTY(QSet<Link::Ptr> links READ links NOTIFY linksUpdated)
-    virtual QSet<Link::Ptr> links() const = 0;
-
-    virtual QSet<wifi::WifiLink::Ptr> wifiLinks() const = 0;
+    Q_PROPERTY(QSet<Link::SPtr> links READ links NOTIFY linksUpdated)
+    virtual QSet<Link::SPtr> links() const = 0;
+
+    virtual QSet<wifi::WifiLink::SPtr> wifiLinks() const = 0;
+
+    virtual QSet<ethernet::EthernetLink::SPtr> ethernetLinks() const = 0;
 
     virtual QSet<wwan::Modem::Ptr> modemLinks() const = 0;
 

=== modified file 'src/indicator/nmofono/nm-device-statistics-monitor.cpp'
--- src/indicator/nmofono/nm-device-statistics-monitor.cpp	2016-11-08 13:34:13 +0000
+++ src/indicator/nmofono/nm-device-statistics-monitor.cpp	2016-12-05 18:14:38 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <nmofono/nm-device-statistics-monitor.h>
+#include <nmofono/ethernet/ethernet-link.h>
 
 #include <NetworkManager.h>
 
@@ -153,10 +154,6 @@
 
     void setUpInterface(const QString &path)
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << path;
-#endif
-
         if (!m_interfaces.contains(path))
         {
             return;
@@ -175,9 +172,6 @@
 
     void resetInterface(const QString &path)
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << path;
-#endif
         if (!m_interfaces.contains(path))
         {
             return;
@@ -189,9 +183,6 @@
 
     void connectAllInterfaces()
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "";
-#endif
         for (auto path : m_interfaces.keys())
         {
             setUpInterface(path);
@@ -200,9 +191,6 @@
 
     void disconnectAllInterfaces()
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "";
-#endif
         for (auto path : m_interfaces.keys())
         {
             resetInterface(path);
@@ -215,9 +203,6 @@
     void handleDisplayPowerStateChange(int status, int reason)
     {
         Q_UNUSED(reason)
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << status;
-#endif
 
         if (m_status != (Status)status) {
             m_status = (Status)status;
@@ -289,7 +274,7 @@
 }
 
 void
-NMDeviceStatisticsMonitor::addLink(Link::Ptr link)
+NMDeviceStatisticsMonitor::addLink(Link::SPtr link)
 {
 #ifdef INDICATOR_NETWORK_TRACE_MESSAGES
     qDebug() << "adding" << link->name();
@@ -299,21 +284,15 @@
 
     if (std::dynamic_pointer_cast<wifi::WifiLinkImpl>(link))
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "   it's a WiFi link";
-#endif
         path = std::dynamic_pointer_cast<wifi::WifiLinkImpl>(link)->device_path().path();
     }
     else if (std::dynamic_pointer_cast<wwan::Modem>(link))
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "   it's a modem link";
-#endif
         path = std::dynamic_pointer_cast<wwan::Modem>(link)->nmPath();
     }
-    else
+    else if (std::dynamic_pointer_cast<ethernet::EthernetLink>(link))
     {
-        qWarning() << "Unhandled link type with name:" << link->name();
+        path = std::dynamic_pointer_cast<ethernet::EthernetLink>(link)->devicePath().path();
     }
 
     if (path.isEmpty())
@@ -335,10 +314,6 @@
 void
 NMDeviceStatisticsMonitor::remove(const QString &nmPath)
 {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    qDebug() << "removing" << nmPath;
-#endif
-
     if (d->m_interfaces.contains(nmPath))
     {
         d->resetInterface(nmPath);

=== modified file 'src/indicator/nmofono/nm-device-statistics-monitor.h'
--- src/indicator/nmofono/nm-device-statistics-monitor.h	2016-10-29 20:09:30 +0000
+++ src/indicator/nmofono/nm-device-statistics-monitor.h	2016-12-05 18:14:38 +0000
@@ -49,7 +49,7 @@
     NMDeviceStatisticsMonitor();
     ~NMDeviceStatisticsMonitor();
 
-    void addLink(Link::Ptr link);
+    void addLink(Link::SPtr link);
 
     void remove(const QString &nmPath);
 

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2016-10-30 18:42:22 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2016-12-05 18:14:38 +0000
@@ -23,7 +23,6 @@
 #include <url-dispatcher-cpp/url-dispatcher.h>
 #include <cassert>
 
-#include <NetworkManagerActiveConnectionInterface.h>
 #include <NetworkManagerDeviceWirelessInterface.h>
 #include <NetworkManagerSettingsConnectionInterface.h>
 
@@ -69,13 +68,14 @@
     shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> m_dev;
     OrgFreedesktopNetworkManagerDeviceWirelessInterface m_wireless;
     shared_ptr<OrgFreedesktopNetworkManagerInterface> m_nm;
+    connection::ActiveConnectionManager::SPtr m_activeConnectionManager;
 
     KillSwitch::Ptr m_killSwitch;
 
     map<AccessPointImpl::Key, shared_ptr<GroupedAccessPoint>> m_grouper;
     uint32_t m_lastState = 0;
     QString m_name;
-    shared_ptr<OrgFreedesktopNetworkManagerConnectionActiveInterface> m_activeConnection;
+    connection::ActiveConnection::SPtr m_activeConnection;
     unique_ptr<QMetaObject::Connection> m_signalStrengthConnection;
     bool m_connecting = false;
     bool m_disconnectWifi = false;
@@ -180,24 +180,21 @@
         }
 
         // already up-to-date
-        if (m_activeConnection && m_activeConnection->path() == path.path())
+        if (m_activeConnection && m_activeConnection->path() == path)
         {
             return;
         }
 
-        try {
-            m_activeConnection = make_shared<
-                    OrgFreedesktopNetworkManagerConnectionActiveInterface>(
-                    NM_DBUS_SERVICE, path.path(), m_dev->connection());
-            uint state = m_activeConnection->state();
+        m_activeConnection = m_activeConnectionManager->connection(path);
+        if (m_activeConnection)
+        {
+            auto state = m_activeConnection->state();
             switch (state) {
-            case NM_ACTIVE_CONNECTION_STATE_UNKNOWN:
-            case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
-            case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
-            case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING:
-            case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED:
-                ;
-
+            case connection::ActiveConnection::State::unknown:
+            case connection::ActiveConnection::State::activating:
+            case connection::ActiveConnection::State::activated:
+            case connection::ActiveConnection::State::deactivating:
+            case connection::ActiveConnection::State::deactivated:
                 // for Wi-Fi devices specific_object is the AccessPoint object.
                 QDBusObjectPath ap_path = m_activeConnection->specificObject();
                 for (auto &ap : m_groupedAccessPoints) {
@@ -216,10 +213,10 @@
                     }
                 }
             }
-        } catch (exception &e) {
-            qWarning() << "failed to get active connection:";
-            qWarning() << "\tpath: " << path.path();
-            qWarning() << "\t" << QString::fromStdString(e.what());
+        }
+        else
+        {
+            qWarning() << "Failed to get active connection:" << path.path();
         }
     }
 
@@ -367,9 +364,11 @@
 
 WifiLinkImpl::WifiLinkImpl(shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> dev,
            shared_ptr<OrgFreedesktopNetworkManagerInterface> nm,
-           KillSwitch::Ptr killSwitch)
+           KillSwitch::Ptr killSwitch,
+           connection::ActiveConnectionManager::SPtr activeConnectionManager)
     : d(new Private(*this, dev, nm, killSwitch)) {
     d->m_name = d->m_dev->interface();
+    d->m_activeConnectionManager = activeConnectionManager;
 
     connect(&d->m_wireless, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointAdded, d.get(), &Private::ap_added);
     connect(&d->m_wireless, &OrgFreedesktopNetworkManagerDeviceWirelessInterface::AccessPointRemoved, d.get(), &Private::ap_removed);

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.h'
--- src/indicator/nmofono/wifi/wifi-link-impl.h	2016-10-30 18:42:22 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.h	2016-12-05 18:14:38 +0000
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <nmofono/kill-switch.h>
+#include <nmofono/connection/active-connection-manager.h>
 #include <nmofono/wifi/wifi-link.h>
 #include <util/qhash-sharedptr.h>
 
@@ -39,7 +40,8 @@
 
     WifiLinkImpl(std::shared_ptr<OrgFreedesktopNetworkManagerDeviceInterface> dev,
          std::shared_ptr<OrgFreedesktopNetworkManagerInterface> nm,
-         KillSwitch::Ptr killSwitch);
+         KillSwitch::Ptr killSwitch,
+         connection::ActiveConnectionManager::SPtr activeConnectionManager);
     ~WifiLinkImpl();
 
     // public API

=== modified file 'src/indicator/nmofono/wifi/wifi-link.h'
--- src/indicator/nmofono/wifi/wifi-link.h	2015-10-06 10:19:30 +0000
+++ src/indicator/nmofono/wifi/wifi-link.h	2016-12-05 18:14:38 +0000
@@ -23,6 +23,7 @@
 #include <nmofono/wifi/access-point.h>
 
 #include <QSet>
+#include <unity/util/DefinesPtrs.h>
 
 namespace nmofono {
 namespace wifi {
@@ -38,7 +39,7 @@
     Q_OBJECT
 
 public:
-    typedef std::shared_ptr<WifiLink> Ptr;
+    UNITY_DEFINES_PTRS(WifiLink);
     typedef unsigned int Id;
 
     enum class Mode

=== modified file 'src/indicator/root-state.cpp'
--- src/indicator/root-state.cpp	2016-10-29 20:09:30 +0000
+++ src/indicator/root-state.cpp	2016-12-05 18:14:38 +0000
@@ -195,6 +195,22 @@
         // some sort of connection animation
         break;
     case Manager::NetworkingStatus::online:
+        multimap<Link::Id, ethernet::EthernetLink::SPtr> sortedEthernetLinks;
+        for (auto ethernetLink : m_manager->ethernetLinks())
+        {
+            sortedEthernetLinks.insert(make_pair(ethernetLink->id(), ethernetLink));
+        }
+        for (auto pair : sortedEthernetLinks)
+        {
+            auto ethernetLink = pair.second;
+
+            connect(ethernetLink.get(), &ethernet::EthernetLink::statusUpdated, this,
+                    &Private::updateNetworkingIcon, Qt::UniqueConnection);
+
+            auto status = ethernetLink->status();
+            m_networkingIcons << Icons::ethernetIcon(status);
+        }
+
         for (auto wifiLink : m_manager->wifiLinks())
         {
             connect(wifiLink.get(), &wifi::WifiLink::statusUpdated, this,

=== added file 'src/indicator/sections/ethernet-link-section.cpp'
--- src/indicator/sections/ethernet-link-section.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/sections/ethernet-link-section.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <menuitems/ethernet-connection-item.h>
+#include <menuitems/ethernet-link-item.h>
+#include <sections/ethernet-link-section.h>
+
+#include "menumodel-cpp/action-group-merger.h"
+#include "menumodel-cpp/menu.h"
+#include "menumodel-cpp/menu-merger.h"
+
+#include <util/localisation.h>
+#include <util/qhash-sharedptr.h>
+
+using namespace std;
+using namespace nmofono;
+using namespace nmofono::connection;
+using namespace nmofono::ethernet;
+
+class EthernetLinkSection::Private : public QObject
+{
+Q_OBJECT
+public:
+    Manager::Ptr m_manager;
+
+    EthernetLink::SPtr m_link;
+
+    ActionGroupMerger::Ptr m_actionGroupMerger;
+
+    ActionGroup::Ptr m_actionGroup;
+
+    MenuMerger::Ptr m_menuMerger;
+
+    Menu::Ptr m_menu;
+
+    MenuItem::Ptr m_item;
+
+    Menu::Ptr m_linkMenu;
+
+    EthernetLinkItem::SPtr m_linkItem;
+
+    Menu::Ptr m_connectionsMenu;
+
+    QMap<AvailableConnection::SPtr, EthernetConnectionItem::SPtr> m_items;
+
+    Action::Ptr m_connectionAction;
+
+    Private()
+    {
+    }
+
+public Q_SLOTS:
+    void
+    linksChanged()
+    {
+        m_linkItem->setShowInterface(m_manager->ethernetLinks().size() > 1);
+    }
+
+    void
+    updateConnections()
+    {
+        auto connections = m_link->availableConnections().toSet();
+        auto current(m_items.keys().toSet());
+
+        auto removed(current);
+        removed.subtract(connections);
+
+        auto added(connections);
+        added.subtract(current);
+
+        for (auto connection : removed)
+        {
+            m_actionGroupMerger->remove(m_items[connection]->actionGroup());
+            m_items.remove(connection);
+        }
+
+        for (auto connection : added)
+        {
+            auto item = make_shared<EthernetConnectionItem>(connection, m_connectionAction);
+            m_items[connection] = item;
+            m_actionGroupMerger->add(item->actionGroup());
+
+            // Make sure we re-order if the ID changes
+            connect(connection.get(), &AvailableConnection::connectionIdChanged, this, &Private::updateConnections, Qt::UniqueConnection);
+        }
+
+        m_connectionsMenu->clear();
+
+        if (connections.size() <= 1)
+        {
+            return;
+        }
+
+        QMap<QString, EthernetConnectionItem::SPtr> sorted;
+        for (QMapIterator<AvailableConnection::SPtr, EthernetConnectionItem::SPtr> it(m_items); it.hasNext();)
+        {
+            it.next();
+            sorted[it.key()->connectionId()] = it.value();
+        }
+        for (auto item : sorted)
+        {
+            m_connectionsMenu->append(item->menuItem());
+        }
+    }
+
+    void
+    actionActivated(const Variant& value)
+    {
+        auto uuid = QString::fromStdString(value.as<string>());
+        QMapIterator<AvailableConnection::SPtr, EthernetConnectionItem::SPtr> it(m_items);
+        while (it.hasNext())
+        {
+            it.next();
+
+            auto connection = it.key();
+            if (connection->connectionUuid() == uuid)
+            {
+                m_link->setPreferredConnection(connection);
+                break;
+            }
+        }
+    }
+
+    void
+    preferredConnectionChanged(AvailableConnection::SPtr preferredConnection)
+    {
+        if (preferredConnection)
+        {
+            m_connectionAction->setState(TypedVariant<string>(preferredConnection->connectionUuid().toStdString()));
+        }
+        else
+        {
+            m_connectionAction->setState(TypedVariant<string>(""));
+        }
+    }
+};
+
+EthernetLinkSection::EthernetLinkSection(Manager::Ptr manager, EthernetLink::SPtr link) :
+        d(new Private())
+{
+    d->m_manager = manager;
+    d->m_link = link;
+
+    d->m_actionGroupMerger = make_shared<ActionGroupMerger>();
+    d->m_actionGroup = make_shared<ActionGroup>();
+    d->m_actionGroupMerger->add(d->m_actionGroup);
+
+    d->m_menuMerger = make_shared<MenuMerger>();
+
+    d->m_linkMenu = make_shared<Menu>();
+    d->m_linkItem = make_shared<EthernetLinkItem>(d->m_link);
+    d->m_linkMenu->append(d->m_linkItem->menuItem());
+    d->m_actionGroupMerger->add(d->m_linkItem->actionGroup());
+
+    d->m_connectionsMenu = make_shared<Menu>();
+
+    // have the ethernet link in its own section
+    d->m_item = MenuItem::newSection(d->m_menuMerger);
+    d->m_menu = make_shared<Menu>();
+    d->m_menu->append(d->m_item);
+
+    d->m_menuMerger->append(d->m_linkMenu);
+    d->m_menuMerger->append(d->m_connectionsMenu);
+
+    QString actionName = "ethernet." + QString::number(link->id()) + "::connection";
+    d->m_connectionAction = make_shared<Action>(actionName, G_VARIANT_TYPE_STRING, TypedVariant<string>(""));
+    d->m_actionGroup->add(d->m_connectionAction);
+
+    QObject::connect(d->m_manager.get(), &Manager::linksUpdated, d.get(), &Private::linksChanged);
+    d->linksChanged();
+    QObject::connect(d->m_link.get(), &EthernetLink::availableConnectionsChanged, d.get(), &Private::updateConnections);
+    d->updateConnections();
+    QObject::connect(d->m_link.get(), &EthernetLink::preferredConnectionChanged, d.get(), &Private::preferredConnectionChanged);
+    d->preferredConnectionChanged(d->m_link->preferredConnection());
+
+    QObject::connect(d->m_connectionAction.get(), &Action::activated, d.get(), &Private::actionActivated);
+}
+
+EthernetLinkSection::~EthernetLinkSection()
+{
+}
+
+ActionGroup::Ptr
+EthernetLinkSection::actionGroup()
+{
+    return d->m_actionGroupMerger->actionGroup();
+}
+
+MenuModel::Ptr
+EthernetLinkSection::menuModel()
+{
+    return d->m_menu;
+}
+
+#include "ethernet-link-section.moc"

=== added file 'src/indicator/sections/ethernet-link-section.h'
--- src/indicator/sections/ethernet-link-section.h	1970-01-01 00:00:00 +0000
+++ src/indicator/sections/ethernet-link-section.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <nmofono/manager.h>
+#include <nmofono/ethernet/ethernet-link.h>
+
+#include <menuitems/section.h>
+
+class EthernetLinkSection : public Section
+{
+public:
+    UNITY_DEFINES_PTRS(EthernetLinkSection);
+
+    explicit EthernetLinkSection(nmofono::Manager::Ptr manager, nmofono::ethernet::EthernetLink::SPtr link);
+
+    ~EthernetLinkSection();
+
+    ActionGroup::Ptr
+    actionGroup() override;
+
+    MenuModel::Ptr
+    menuModel() override;
+
+protected:
+    class Private;
+    std::shared_ptr<Private> d;
+};

=== added file 'src/indicator/sections/ethernet-section.cpp'
--- src/indicator/sections/ethernet-section.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/sections/ethernet-section.cpp	2016-12-05 18:14:38 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <sections/ethernet-link-section.h>
+#include <sections/ethernet-section.h>
+#include <menuitems/switch-item.h>
+#include <menuitems/text-item.h>
+
+#include "menumodel-cpp/action-group.h"
+#include "menumodel-cpp/action-group-merger.h"
+#include "menumodel-cpp/menu.h"
+#include "menumodel-cpp/menu-merger.h"
+
+#include <util/localisation.h>
+#include <util/qhash-sharedptr.h>
+
+using namespace std;
+using namespace nmofono;
+using namespace nmofono::ethernet;
+
+class EthernetSection::Private : public QObject
+{
+    Q_OBJECT
+public:
+    Manager::Ptr m_manager;
+
+    Menu::Ptr m_settingsMenu;
+
+    ActionGroupMerger::Ptr m_actionGroupMerger;
+
+    MenuMerger::Ptr m_menuMerger;
+
+    QMap<EthernetLink::SPtr, EthernetLinkSection::SPtr> m_items;
+
+    Private()
+    {
+    }
+
+public Q_SLOTS:
+    void linksChanged()
+    {
+        auto links = m_manager->ethernetLinks();
+        auto current(m_items.keys().toSet());
+
+        auto removed(current);
+        removed.subtract(links);
+
+        auto added(links);
+        added.subtract(current);
+
+        if (added.isEmpty() && removed.isEmpty())
+        {
+            return;
+        }
+
+        for (auto connection : removed)
+        {
+            m_actionGroupMerger->remove(m_items[connection]->actionGroup());
+            m_items.remove(connection);
+        }
+
+        for (auto link : added)
+        {
+            auto section = make_shared<EthernetLinkSection>(m_manager, link);
+            m_items[link] = section;
+            m_actionGroupMerger->add(section->actionGroup());
+        }
+
+        m_menuMerger->clear();
+
+        multimap<Link::Id, EthernetLinkSection::SPtr> sorted;
+        QMapIterator<EthernetLink::SPtr, EthernetLinkSection::SPtr> it(m_items);
+        while (it.hasNext())
+        {
+            it.next();
+            sorted.insert(make_pair(it.key()->id(), it.value()));
+        }
+        for (auto pair : sorted)
+        {
+            m_menuMerger->append(pair.second->menuModel());
+        }
+
+        if (!links.isEmpty())
+        {
+            m_menuMerger->append(m_settingsMenu);
+        }
+    }
+};
+
+EthernetSection::EthernetSection(Manager::Ptr manager)
+    : d{new Private()}
+{
+    d->m_manager = manager;
+
+    d->m_actionGroupMerger = make_shared<ActionGroupMerger>();
+    d->m_menuMerger = make_shared<MenuMerger>();
+
+    auto settingsItem = make_shared<TextItem>(_("Ethernet settings…"), "ethernet", "settings");
+    d->m_actionGroupMerger->add(settingsItem->actionGroup());
+
+    d->m_settingsMenu = make_shared<Menu>();
+    d->m_settingsMenu->append(settingsItem->menuItem());
+
+    QObject::connect(d->m_manager.get(), &Manager::linksUpdated, d.get(), &Private::linksChanged);
+    d->linksChanged();
+}
+
+EthernetSection::~EthernetSection()
+{
+}
+
+ActionGroup::Ptr
+EthernetSection::actionGroup()
+{
+    return d->m_actionGroupMerger->actionGroup();
+}
+
+MenuModel::Ptr
+EthernetSection::menuModel()
+{
+    return d->m_menuMerger;
+}
+
+#include "ethernet-section.moc"

=== added file 'src/indicator/sections/ethernet-section.h'
--- src/indicator/sections/ethernet-section.h	1970-01-01 00:00:00 +0000
+++ src/indicator/sections/ethernet-section.h	2016-12-05 18:14:38 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <nmofono/manager.h>
+
+#include <menuitems/section.h>
+
+class EthernetSection : public Section
+{
+public:
+    UNITY_DEFINES_PTRS(EthernetSection);
+
+    explicit EthernetSection(nmofono::Manager::Ptr manager);
+
+    ~EthernetSection();
+
+    ActionGroup::Ptr
+    actionGroup() override;
+
+    MenuModel::Ptr
+    menuModel() override;
+
+protected:
+    class Private;
+    std::shared_ptr<Private> d;
+};

=== modified file 'src/indicator/sections/quick-access-section.h'
--- src/indicator/sections/quick-access-section.h	2015-08-14 15:52:39 +0000
+++ src/indicator/sections/quick-access-section.h	2016-12-05 18:14:38 +0000
@@ -32,7 +32,8 @@
     std::shared_ptr<Private> d;
 
 public:
-    typedef std::shared_ptr<QuickAccessSection> Ptr;
+    UNITY_DEFINES_PTRS(QuickAccessSection);
+
     QuickAccessSection(nmofono::Manager::Ptr manager, SwitchItem::Ptr flightModeSwitch);
     virtual ~QuickAccessSection();
 

=== modified file 'src/indicator/sections/vpn-section.cpp'
--- src/indicator/sections/vpn-section.cpp	2015-10-20 10:20:17 +0000
+++ src/indicator/sections/vpn-section.cpp	2016-12-05 18:14:38 +0000
@@ -46,7 +46,6 @@
     Menu::Ptr m_topMenu;
     MenuItem::Ptr m_topItem;
 
-    MenuItem::Ptr m_vpnSettingsItem;
     Menu::Ptr m_vpnSettingsMenu;
     TextItem::Ptr m_openVpnSettings;
 

=== modified file 'src/indicator/sections/wifi-section.cpp'
--- src/indicator/sections/wifi-section.cpp	2015-08-14 15:52:39 +0000
+++ src/indicator/sections/wifi-section.cpp	2016-12-05 18:14:38 +0000
@@ -30,8 +30,10 @@
 #include "menumodel-cpp/menu-merger.h"
 
 #include <util/localisation.h>
+#include <util/qhash-sharedptr.h>
 
 using namespace nmofono;
+using namespace std;
 
 class WifiSection::Private : public QObject
 {
@@ -40,36 +42,35 @@
     Manager::Ptr m_manager;
 
     ActionGroupMerger::Ptr m_actionGroupMerger;
+    MenuMerger::Ptr m_menuMerger;
+
+    Menu::Ptr m_switchMenu;
     Menu::Ptr m_menu;
     Menu::Ptr m_settingsMenu;
 
     SwitchItem::Ptr m_switch;
 
-    WifiLinkItem::Ptr m_wifiLink;
+    QMap<wifi::WifiLink::SPtr, WifiLinkItem::Ptr> m_items;
     TextItem::Ptr m_openWifiSettings;
 
     Private(Manager::Ptr manager, SwitchItem::Ptr wifiSwitch)
         : m_manager{manager}, m_switch{wifiSwitch}
     {
-        m_actionGroupMerger = std::make_shared<ActionGroupMerger>();
-        m_menu = std::make_shared<Menu>();
-        m_settingsMenu = std::make_shared<Menu>();
-
-        /// @todo don't now really care about actully being able to detach the whole
-        ///       wifi chipset. on touch devices we always have wifi.
-        if (m_manager->hasWifi()) {
-            m_menu->append(m_switch->menuItem());
-            m_settingsMenu->append(m_switch->menuItem());
-        }
-
-        m_openWifiSettings = std::make_shared<TextItem>(_("Wi-Fi settings…"), "wifi", "settings");
+        m_actionGroupMerger = make_shared<ActionGroupMerger>();
+        m_menuMerger = make_shared<MenuMerger>();
+        m_switchMenu = make_shared<Menu>();
+        m_menu = make_shared<Menu>();
+        m_settingsMenu = make_shared<Menu>();
+
+        m_openWifiSettings = make_shared<TextItem>(_("Wi-Fi settings…"), "wifi", "settings");
         connect(m_openWifiSettings.get(), &TextItem::activated, this, &Private::openWiFiSettings);
 
+        m_actionGroupMerger->add(m_switch->actionGroup());
         m_actionGroupMerger->add(m_openWifiSettings->actionGroup());
-        m_menu->append(m_openWifiSettings->menuItem());
+        m_menuMerger->append(m_switchMenu);
+        m_menuMerger->append(m_menu);
+        m_menuMerger->append(m_settingsMenu);
 
-        // We have this last because the menu item insertion location
-        // depends on the presence of the WiFi settings item.
         updateLinks();
         connect(m_manager.get(), &Manager::linksUpdated, this, &Private::updateLinks);
     }
@@ -77,35 +78,70 @@
 public Q_SLOTS:
     void openWiFiSettings()
     {
-        UrlDispatcher::send("settings:///system/wifi", [](std::string url, bool success){
+        UrlDispatcher::send("settings:///system/wifi", [](string url, bool success){
             if (!success)
-                std::cerr << "URL Dispatcher failed on " << url << std::endl;
+                cerr << "URL Dispatcher failed on " << url << endl;
         });
     }
 
     void updateLinks()
     {
-        // remove all and recreate. we have top 1 now anyway
-        if (m_wifiLink) {
-            m_actionGroupMerger->remove(m_wifiLink->actionGroup());
-            m_menu->removeAll(m_wifiLink->menuItem());
-            m_settingsMenu->removeAll(m_wifiLink->menuItem());
-            m_wifiLink.reset();
-        }
-
-        for (auto wifi_link : m_manager->wifiLinks()) {
-            m_wifiLink = std::make_shared<WifiLinkItem>(wifi_link);
-
-            m_actionGroupMerger->add(m_wifiLink->actionGroup());
-            auto comp = [this](MenuItem::Ptr, MenuItem::Ptr other)
-            {
-                return other == m_openWifiSettings->menuItem();
-            };
-            m_menu->insert(m_wifiLink->menuItem(), comp);
-            m_settingsMenu->insert(m_wifiLink->menuItem(), comp);
-
-            // just take the first one
-            break;
+        auto links = m_manager->wifiLinks();
+        auto current(m_items.keys().toSet());
+
+        auto removed(current);
+        removed.subtract(links);
+
+        auto added(links);
+        added.subtract(current);
+
+        if (removed.isEmpty() && added.isEmpty())
+        {
+            return;
+        }
+
+        for (auto link : removed)
+        {
+            m_actionGroupMerger->remove(m_items[link]->actionGroup());
+            m_items.remove(link);
+        }
+
+        for (auto link : added)
+        {
+            auto item = make_shared<WifiLinkItem>(link);
+            m_items[link] = item;
+            m_actionGroupMerger->add(item->actionGroup());
+        }
+
+        m_menu->clear();
+
+        multimap<Link::Id, WifiLinkItem::Ptr> sorted;
+        QMapIterator<wifi::WifiLink::SPtr, WifiLinkItem::Ptr> it(m_items);
+        while (it.hasNext())
+        {
+            it.next();
+            sorted.insert(make_pair(it.key()->id(), it.value()));
+        }
+        for (auto pair : sorted)
+        {
+            m_menu->append(pair.second->menuItem());
+        }
+
+        if (links.isEmpty())
+        {
+            m_switchMenu->removeAll(m_switch->menuItem());
+            m_settingsMenu->removeAll(m_openWifiSettings->menuItem());
+        }
+        else
+        {
+            if (m_settingsMenu->find(m_openWifiSettings->menuItem()) == m_settingsMenu->end())
+            {
+                m_settingsMenu->append(m_openWifiSettings->menuItem());
+            }
+            if (m_switchMenu->find(m_switch->menuItem()) == m_switchMenu->end())
+            {
+                m_switchMenu->append(m_switch->menuItem());
+            }
         }
     }
 };
@@ -127,7 +163,7 @@
 MenuModel::Ptr
 WifiSection::menuModel()
 {
-    return d->m_menu;
+    return d->m_menuMerger;
 }
 
 MenuModel::Ptr

=== modified file 'src/indicator/sections/wifi-section.h'
--- src/indicator/sections/wifi-section.h	2015-08-14 15:52:39 +0000
+++ src/indicator/sections/wifi-section.h	2016-12-05 18:14:38 +0000
@@ -30,7 +30,8 @@
     std::shared_ptr<Private> d;
 
 public:
-    typedef std::shared_ptr<WifiSection> Ptr;
+    UNITY_DEFINES_PTRS(WifiSection);
+
     explicit WifiSection(nmofono::Manager::Ptr manager, SwitchItem::Ptr wifiSwitch);
     virtual ~WifiSection();
 

=== modified file 'src/indicator/sections/wwan-section.cpp'
--- src/indicator/sections/wwan-section.cpp	2016-07-05 10:49:27 +0000
+++ src/indicator/sections/wwan-section.cpp	2016-12-05 18:14:38 +0000
@@ -58,7 +58,7 @@
     SwitchItem::Ptr m_hotspotSwitch;
     TextItem::Ptr m_openCellularSettings;
 
-    QMap<wwan::Modem::Ptr, WwanLinkItem::Ptr> m_items;
+    QMap<wwan::Modem::Ptr, WwanLinkItem::SPtr> m_items;
 
     Private() = delete;
     Private(Manager::Ptr modemManager, SwitchItem::Ptr mobileDataSwitch ,SwitchItem::Ptr hotspotSwitch);
@@ -139,7 +139,7 @@
     m_linkMenuMerger->clear();
 
     multimap<int, WwanLinkItem::Ptr, wwan::Modem::Compare> sorted;
-    QMapIterator<wwan::Modem::Ptr, WwanLinkItem::Ptr> it(m_items);
+    QMapIterator<wwan::Modem::Ptr, WwanLinkItem::SPtr> it(m_items);
     while (it.hasNext())
     {
         it.next();

=== modified file 'src/indicator/sections/wwan-section.h'
--- src/indicator/sections/wwan-section.h	2016-05-05 14:15:23 +0000
+++ src/indicator/sections/wwan-section.h	2016-12-05 18:14:38 +0000
@@ -29,7 +29,8 @@
     std::shared_ptr<Private> d;
 
 public:
-    typedef std::shared_ptr<WwanSection> Ptr;
+    UNITY_DEFINES_PTRS(WwanSection);
+
     explicit WwanSection(nmofono::Manager::Ptr modemManager, SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch);
     virtual ~WwanSection();
 

=== modified file 'src/menumodel-cpp/menu-item.cpp'
--- src/menumodel-cpp/menu-item.cpp	2016-05-26 13:51:39 +0000
+++ src/menumodel-cpp/menu-item.cpp	2016-12-05 18:14:38 +0000
@@ -102,6 +102,18 @@
     Q_EMIT changed();
 }
 
+void MenuItem::setActionAndTargetValue(const QString &action, const Variant& target)
+{
+    if (m_action == action)
+    {
+        return;
+    }
+
+    m_action = action;
+    g_menu_item_set_action_and_target_value(m_gmenuitem.get(), m_action.toUtf8().constData(), target);
+    Q_EMIT changed();
+}
+
 void MenuItem::setAttribute(const QString &attribute,
                   Variant value)
 {

=== modified file 'src/menumodel-cpp/menu-item.h'
--- src/menumodel-cpp/menu-item.h	2015-10-06 10:14:57 +0000
+++ src/menumodel-cpp/menu-item.h	2016-12-05 18:14:38 +0000
@@ -74,6 +74,8 @@
 
     void setAction(const QString &value);
 
+    void setActionAndTargetValue(const QString &value, const Variant& target);
+
     void setAttribute(const QString &attribute,
                       Variant value);
 

=== modified file 'src/menumodel-cpp/menu.cpp'
--- src/menumodel-cpp/menu.cpp	2015-04-01 15:28:56 +0000
+++ src/menumodel-cpp/menu.cpp	2016-12-05 18:14:38 +0000
@@ -147,6 +147,11 @@
     return m_items.end();
 }
 
+std::size_t Menu::size() const
+{
+    return m_items.size();
+}
+
 // clear the whole menu
 void Menu::clear()
 {

=== modified file 'src/menumodel-cpp/menu.h'
--- src/menumodel-cpp/menu.h	2015-04-24 08:47:08 +0000
+++ src/menumodel-cpp/menu.h	2016-12-05 18:14:38 +0000
@@ -79,6 +79,8 @@
 
     iterator end();
 
+    std::size_t size() const;
+
     // clear the whole menu
     void clear();
 

=== modified file 'src/qdbus-stubs/CMakeLists.txt'
--- src/qdbus-stubs/CMakeLists.txt	2016-10-29 20:09:30 +0000
+++ src/qdbus-stubs/CMakeLists.txt	2016-12-05 18:14:38 +0000
@@ -18,6 +18,7 @@
 set_source_files_properties(
     "${DATA_DIR}/nm-device.xml"
     "${DATA_DIR}/nm-device-statistics.xml"
+    "${DATA_DIR}/nm-device-ethernet.xml"
     "${DATA_DIR}/nm-device-wifi.xml"
     "${DATA_DIR}/nm-access-point.xml"
     "${DATA_DIR}/nm-active-connection.xml"
@@ -80,6 +81,12 @@
 
 qt5_add_dbus_interface(
     CONNECTIVITY_BACKEND_SRC
+    "${DATA_DIR}/nm-device-ethernet.xml"
+    NetworkManagerDeviceWiredInterface
+)
+
+qt5_add_dbus_interface(
+    CONNECTIVITY_BACKEND_SRC
     "${DATA_DIR}/nm-device-wifi.xml"
     NetworkManagerDeviceWirelessInterface
 )

=== modified file 'tests/data/networkmanager.py'
--- tests/data/networkmanager.py	2016-10-28 15:26:34 +0000
+++ tests/data/networkmanager.py	2016-12-05 18:14:38 +0000
@@ -171,6 +171,12 @@
     return active_conn
 
 
+def device_disconnect(self):
+    active_connection = self.Get(DEVICE_IFACE, 'ActiveConnection')
+    NM = dbusmock.get_object(MAIN_OBJ)
+    NM.RemoveActiveConnection(self.path, active_connection)
+
+
 def deactivate_connection(self, active_conn_path):
     NM = dbusmock.get_object(MAIN_OBJ)
 
@@ -317,12 +323,16 @@
              'Interface': iface_name,
              'ActiveConnection': dbus.ObjectPath('/'),
              'AvailableConnections': dbus.Array([], signature='o'),
-             'AutoConnect': False,
+             'Autoconnect': False, # Network Manager captializes this differently than other properties
              'Managed': True,
              'Driver': 'dbusmock',
              'IpInterface': ''}
 
     obj = dbusmock.get_object(path)
+    obj.disconnect = device_disconnect
+    obj.AddMethods(DEVICE_IFACE, [
+        ('Disconnect', '', '', "self.disconnect(self)")
+    ])
     obj.AddProperties(DEVICE_IFACE, props)
     obj.AddProperties(DEVICE_STATISTICS_IFACE,
                       {
@@ -352,7 +362,7 @@
              'Interface': ofono_path[1:],
              'ActiveConnection': dbus.ObjectPath('/'),
              'AvailableConnections': dbus.Array([], signature='o'),
-             'AutoConnect': False,
+             'Autoconnect': False, # Network Manager captializes this differently than other properties
              'Managed': True,
              'Driver': 'ofono',
              'Udi': ofono_path,
@@ -370,6 +380,10 @@
                           'TxBytes': dbus.UInt64(0),
                           'RxBytes': dbus.UInt64(0),
                       })
+    obj.disconnect = device_disconnect
+    obj.AddMethods(DEVICE_IFACE, [
+        ('Disconnect', '', '', "self.disconnect(self)")
+    ])
 
     devices = self.Get(MAIN_IFACE, 'Devices')
     devices.append(path)
@@ -421,7 +435,7 @@
                           {
                               'ActiveConnection': dbus.ObjectPath('/'),
                               'AvailableConnections': dbus.Array([], signature='o'),
-                              'AutoConnect': False,
+                              'Autoconnect': False, # Network Manager captializes this differently than other properties
                               'Managed': True,
                               'Driver': 'dbusmock',
                               'DeviceType': dbus.UInt32(2),
@@ -429,6 +443,10 @@
                               'Interface': iface_name,
                               'IpInterface': iface_name,
                           })
+    dev_obj.disconnect = device_disconnect
+    dev_obj.AddMethods(DEVICE_IFACE, [
+        ('Disconnect', '', '', "self.disconnect(self)")
+    ])
     dev_obj.AddProperties(DEVICE_STATISTICS_IFACE,
                           {
                               'RefreshRateMs': dbus.UInt32(0),
@@ -635,13 +653,13 @@
                    },
                    [])
 
+    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
+    active_connections.append(dbus.ObjectPath(active_connection_path))
+    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections)
+    
     for dev_path in devices:
         self.SetDeviceActive(dev_path, active_connection_path)
 
-    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
-    active_connections.append(dbus.ObjectPath(active_connection_path))
-    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections)
-
     return active_connection_path
 
 
@@ -753,13 +771,47 @@
     https://developer.gnome.org/NetworkManager/0.9/spec.html
         #type-String_String_Variant_Map_Map
 
-    If you omit uuid, this method adds one for you.
+    If you omit connection uuid or timestamp, this method adds one for you.
+    
+    Note that this automatically associates the connection settings object
+    with the first device that was created.
     '''
 
-    if 'uuid' not in connection_settings['connection']:
-        connection_settings['connection']['uuid'] = str(uuid.uuid4())
-
     NM = dbusmock.get_object(MAIN_OBJ)
+    devices = NM.GetDevices()
+
+    dev = None
+    
+    auto_connect = False
+    if 'autoconnect' in connection_settings['connection']:
+        auto_connect = connection_settings['connection']['autoconnect']
+    
+    # Grab the first device if we are to auto-connect
+    if auto_connect and len(devices) > 0:
+        dev = devices[0]
+        
+    connection_path = self.AddDeviceConnection(dev, connection_settings)
+
+    if auto_connect and dev:
+        activate_connection(NM, connection_path, dev, connection_path)
+
+    return connection_path
+    
+    
[e-mail](MOCK_IFACE,
+                     in_signature='sa{sa{sv}}', out_signature='s')
+def AddDeviceConnection(self, dev_path, settings):
+    '''Add an available connection to an existing WiFi device and access point.
+
+    You have to specify device path and a settings map.
+    
+    settings is a String String Variant Map Map. See
+    https://developer.gnome.org/NetworkManager/0.9/spec.html
+        #type-String_String_Variant_Map_Map
+
+    Returns the new object path.
+    '''
+
     settings_obj = dbusmock.get_object(SETTINGS_OBJ)
     main_connections = settings_obj.ListConnections()
 
@@ -772,6 +824,39 @@
         count += 1
     connection_path = str(connection_obj_path)
 
+    # Fill in the blanks if they haven't been provided    
+    if not 'connection' in settings:
+        settings['connection'] = {}
+
+    if not 'uuid' in settings['connection']:
+        settings['connection']['uuid'] = str(uuid.uuid4())
+        
+    if not 'timestamp' in settings['connection']:
+        settings['connection']['timestamp'] = dbus.UInt64(1374828522)
+        
+    if not 'ipv4' in settings:
+        settings['ipv4'] = {
+          'address-data': dbus.Array([], signature='a{sv}'),
+          'addresses': dbus.Array([], signature='au'),
+          'dns': dbus.Array([], signature='u'),
+          'dns-search': dbus.Array([], signature='s'),
+          'method': 'auto',
+          'route-data': dbus.Array([], signature='a{sv}'),
+          'routes': dbus.Array([], signature='au')
+        }
+
+    if not 'ipv6' in settings:
+        settings['ipv6'] = {
+          'address-data': dbus.Array([], signature='a{sv}'),
+          'addresses': dbus.Array([], signature='(ayuay)'),
+          'dns': dbus.Array([], signature='ay'),
+          'dns-search': dbus.Array([], signature='s'),
+          'ip6-privacy': 0,
+          'method': 'auto',
+          'route-data': dbus.Array([], signature='a{sv}'),
+          'routes': dbus.Array([], signature='(ayuayu)')
+        }
+
     self.AddObject(connection_path,
                    CSETTINGS_IFACE,
                    {
@@ -785,33 +870,23 @@
                    ])
 
     connection_obj = dbusmock.get_object(connection_path)
-    connection_obj.settings = connection_settings
+    connection_obj.settings = settings
     connection_obj.connection_path = connection_path
     connection_obj.ConnectionDelete = ConnectionDelete
     connection_obj.ConnectionGetSettings = ConnectionGetSettings
     connection_obj.ConnectionGetSecrets = ConnectionGetSecrets
     connection_obj.ConnectionUpdate = ConnectionUpdate
 
+    if dev_path and dev_path != '' and dev_path != '/':
+        dev_obj = dbusmock.get_object(dev_path)
+        connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+        connections.append(dbus.ObjectPath(connection_path))
+        dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
     main_connections.append(connection_path)
     settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
-
     settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [connection_path])
 
-    auto_connect = False
-    if 'autoconnect' in connection_settings['connection']:
-        auto_connect = connection_settings['connection']['autoconnect']
-
-    if auto_connect:
-        dev = None
-        devices = NM.GetDevices()
-
-        # Grab the first device.
-        if len(devices) > 0:
-            dev = devices[0]
-
-        if dev:
-            activate_connection(NM, connection_path, dev, connection_path)
-
     return connection_path
 
 

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2016-11-08 13:34:13 +0000
+++ tests/integration/CMakeLists.txt	2016-12-05 18:14:38 +0000
@@ -1,8 +1,5 @@
 
 set(INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR "${CMAKE_BINARY_DIR}/data") #need this somewhere higher up in the hierarchy
-#set(INDICATOR_NETWORK_UNDER_TESTING 1)
-#set(INDICATOR_NETWORK_TESTING_GSETTINGS_INI=${CMAKE_BINARY_DIR}/data/test_gsettings.ini)
-#set(GSETTINGS_SCHEMA_DIR="${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}")
 
 add_definitions(
     -DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator/indicator-network-service"

=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2016-11-08 13:34:13 +0000
+++ tests/integration/indicator-network-test-base.cpp	2016-12-05 18:14:38 +0000
@@ -217,15 +217,21 @@
             "/com/canonical/indicator/network/unlocksim" + to_string(exportId));
 }
 
-void IndicatorNetworkTestBase::startIndicator()
+void
+IndicatorNetworkTestBase::startIndicator()
 {
     try
     {
-        indicator.reset(
-                new QProcessDBusService(DBusTypes::DBUS_NAME,
-                                        QDBusConnection::SessionBus,
-                                        NETWORK_SERVICE_BIN,
-                                        QStringList()));
+        if (qEnvironmentVariableIsSet("TEST_WITH_GDB"))
+        {
+            indicator.reset(new QProcessDBusService(DBusTypes::DBUS_NAME, QDBusConnection::SessionBus, "/usr/bin/gdb", QStringList
+                { "-batch", "-ex", "run", "-ex", "bt", NETWORK_SERVICE_BIN }));
+        }
+        else
+        {
+            indicator.reset(new QProcessDBusService(DBusTypes::DBUS_NAME, QDBusConnection::SessionBus,
+                NETWORK_SERVICE_BIN, QStringList()));
+        }
         indicator->start(dbusTestRunner.sessionConnection());
     }
     catch (exception const& e)
@@ -244,6 +250,40 @@
     {
         EXPECT_FALSE(reply.isError()) << reply.error().message().toStdString();
     }
+    QString path = reply;
+
+    if (state == NM_DEVICE_STATE_ACTIVATED)
+    {
+        setNmProperty(path, NM_DBUS_INTERFACE_DEVICE, "Autoconnect", true);
+    }
+
+    return reply;
+}
+
+QString IndicatorNetworkTestBase::createEthernetConnection(const QString& name, const QString& device)
+{
+    auto& networkManager(dbusMock.networkManagerInterface());
+
+    VariantDictMap settings{
+        {"802-3-ethernet", QVariantMap{
+            {"duplex", "full"},
+            {"mac-address", randomMac().toUtf8()},
+            {"mac-address-blacklist", QStringList()}
+        }},
+        {"connection", QVariantMap{
+            {"id", name},
+            {"interface-name", "ens33"},
+            {"type", "802-3-ethernet"},
+            {"permissions", QStringList()},
+            {"secondaries", QStringList()}
+        }}
+    };
+    auto reply = networkManager.AddDeviceConnection(device, settings);
+    reply.waitForFinished();
+    if (reply.isError())
+    {
+        EXPECT_FALSE(reply.isError()) << reply.error().message().toStdString();
+    }
     return reply;
 }
 
@@ -273,7 +313,6 @@
     return reply;
 }
 
-
 void IndicatorNetworkTestBase::setDeviceStatistics(const QString &device, quint64 tx, quint64 rx)
 {
     auto& networkManager(dbusMock.networkManagerInterface());
@@ -656,6 +695,34 @@
         .action("indicator.cellular.settings");
 }
 
+mh::MenuItemMatcher IndicatorNetworkTestBase::ethernetInfo(const string& label,
+                                                           const string& status,
+                                                           Toggle autoConnect)
+{
+    return mh::MenuItemMatcher()
+        .checkbox()
+        .widget("com.canonical.indicator.switch")
+        .toggled(autoConnect == Toggle::enabled)
+        .label(label)
+        .pass_through_string_attribute("x-canonical-subtitle-action", status);
+}
+
+mh::MenuItemMatcher IndicatorNetworkTestBase::radio(const string& label,
+                                                    Toggle toggled)
+{
+    return mh::MenuItemMatcher()
+        .radio()
+        .label(label)
+        .toggled(toggled == Toggle::enabled);
+}
+
+mh::MenuItemMatcher IndicatorNetworkTestBase::ethernetSettings()
+{
+    return mh::MenuItemMatcher()
+        .label("Ethernet settings…")
+        .action("indicator.ethernet.settings");
+}
+
 QString IndicatorNetworkTestBase::createVpnConnection(const QString& id,
                                                       const QString& serviceType,
                                                       const QStringMap& data,

=== modified file 'tests/integration/indicator-network-test-base.h'
--- tests/integration/indicator-network-test-base.h	2016-10-30 15:13:34 +0000
+++ tests/integration/indicator-network-test-base.h	2016-12-05 18:14:38 +0000
@@ -131,6 +131,12 @@
         disconnected
     };
 
+    enum class Toggle
+    {
+        enabled,
+        disabled
+    };
+
     IndicatorNetworkTestBase();
 
     ~IndicatorNetworkTestBase();
@@ -149,6 +155,8 @@
 
     QString createEthernetDevice(int state, const QString& id = "0");
 
+    QString createEthernetConnection(const QString& name, const QString& device);
+
     QString createWiFiDevice(int state, const QString& id = "0");
 
     QString createOfonoModemDevice(const QString &ofonoPath, const QString& id);
@@ -172,7 +180,7 @@
 
     void removeWifiConnection(const QString& device, const QString& connection);
 
-    QString createActiveConnection(const QString& id, const QString& device, const QString& connection, const QString& specificObject);
+    QString createActiveConnection(const QString& id, const QString& device, const QString& connection, const QString& specificObject = "/");
 
     void removeActiveConnection(const QString& device, const QString& active_connection);
 
@@ -243,8 +251,17 @@
                 bool locked = false,
                 const std::string& connectivityIcon = "");
 
+    static unity::gmenuharness::MenuItemMatcher ethernetInfo(const std::string& label,
+                                                             const std::string& status,
+                                                             Toggle autoConnect = Toggle::enabled);
+
+    static unity::gmenuharness::MenuItemMatcher radio(const std::string& label,
+                                                      Toggle toggled);
+
     static unity::gmenuharness::MenuItemMatcher cellularSettings();
 
+    static unity::gmenuharness::MenuItemMatcher ethernetSettings();
+
     static unity::gmenuharness::MenuItemMatcher vpnSettings();
 
     static unity::gmenuharness::MenuItemMatcher vpnConnection(const std::string& name, ConnectionStatus connected = ConnectionStatus::disconnected);

=== modified file 'tests/integration/test-connectivity-api-sim.cpp'
--- tests/integration/test-connectivity-api-sim.cpp	2016-06-17 11:55:15 +0000
+++ tests/integration/test-connectivity-api-sim.cpp	2016-12-05 18:14:38 +0000
@@ -75,7 +75,7 @@
             << "Present: " << (simState.present ? "y" : "n") << ", "
             << "MCC: " << simState.mcc.toStdString () << ", "
             << "MNC: " << simState.mnc.toStdString () << ", "
-            << "Langs: " << QStringList(simState.preferredLanguages).join (",").toStdString ()
+            << "Langs: [" << QStringList(simState.preferredLanguages).join (",").toStdString () << "], "
             << "Roaming: " << (simState.dataRoamingEnabled ? "y" : "n")
             << ")";
 }

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-11-08 16:47:12 +0000
+++ tests/integration/test-indicator.cpp	2016-12-05 18:14:38 +0000
@@ -22,6 +22,9 @@
 #include <QTestEventLoop>
 #include <QSignalSpy>
 
+#include <NetworkManagerDeviceInterface.h>
+#include <NetworkManagerActiveConnectionInterface.h>
+
 using namespace std;
 using namespace testing;
 using namespace connectivityqt;
@@ -52,12 +55,441 @@
                 .item(modemInfo("", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
-            .item(wifiEnableSwitch())
-            .item(wifiSettings())
-            .item(mh::MenuItemMatcher()
-                .section()
-            )
-        ).match());
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, OneDisabledEthernetAtStartup)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED);
+    auto connection = createEthernetConnection("Home", device);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, OneConnectedEthernetAtStartup)
+{
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createEthernetDevice(NM_DEVICE_STATE_ACTIVATED);
+    auto connection = createEthernetConnection("Home", device);
+    createActiveConnection("0", device, connection);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Connected",
+                      Toggle::enabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, TwoEthernetAtStartupConnectedAndDisconnected)
+{
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+
+    // Active and connected with two connections
+    auto eth0 = createEthernetDevice(NM_DEVICE_STATE_ACTIVATED, "0");
+    auto eth0connection0 = createEthernetConnection("Home", eth0);
+    auto eth0connection1 = createEthernetConnection("Work", eth0);
+    createActiveConnection("0", eth0, eth0connection0);
+
+    // Active but disconnected
+    auto eth1 = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED, "1");
+    setNmProperty(eth1, NM_DBUS_INTERFACE_DEVICE, "Autoconnect", true);
+    auto eth1connection0 = createEthernetConnection("Home", eth1);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected", "network-wired-offline"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet (eth0)",
+                      "Connected",
+                      Toggle::enabled)
+                )
+                .item(radio("Home", Toggle::enabled))
+                .item(radio("Work", Toggle::disabled))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet (eth1)",
+                      "Disconnected",
+                      Toggle::enabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, OneDisabledEthernetAfterStartup)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    auto device = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED);
+    auto connection = createEthernetConnection("Home", device);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, OneConnectedEthernetAfterStartup)
+{
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    auto device = createEthernetDevice(NM_DEVICE_STATE_ACTIVATED);
+    auto connection = createEthernetConnection("Home", device);
+    createActiveConnection("0", device, connection);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Connected",
+                      Toggle::enabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, TwoEthernetAfterStartupConnectedAndDisconnected)
+{
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+
+    ASSERT_NO_THROW(startIndicator());
+
+    // Active and connected with two connections
+    auto eth0 = createEthernetDevice(NM_DEVICE_STATE_ACTIVATED, "0");
+    auto eth0connection0 = createEthernetConnection("Home", eth0);
+    auto eth0connection1 = createEthernetConnection("Work", eth0);
+    createActiveConnection("0", eth0, eth0connection0);
+
+    // Active but disconnected
+    auto eth1 = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED, "1");
+    setNmProperty(eth1, NM_DBUS_INTERFACE_DEVICE, "Autoconnect", true);
+    auto eth1connection0 = createEthernetConnection("Home", eth1);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected", "network-wired-offline"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet (eth0)",
+                      "Connected",
+                      Toggle::enabled)
+                )
+                .item(radio("Home", Toggle::enabled))
+                .item(radio("Work", Toggle::disabled))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet (eth1)",
+                      "Disconnected",
+                      Toggle::enabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, ConnectToEthernet)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED);
+    auto connection = createEthernetConnection("Home", device);
+    OrgFreedesktopNetworkManagerDeviceInterface deviceInterface(NM_DBUS_SERVICE, device, dbusTestRunner.systemConnection());
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_FALSE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_DISCONNECTED, deviceInterface.state());
+    QDBusObjectPath activeConnection = deviceInterface.activeConnection();
+    EXPECT_EQ("/", activeConnection.path().toStdString());
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                    .activate()
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Connected",
+                      Toggle::enabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+
+    EXPECT_TRUE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_ACTIVATED, deviceInterface.state());
+    activeConnection = deviceInterface.activeConnection();
+    EXPECT_NE("/", activeConnection.path().toStdString());
+}
+
+TEST_F(TestIndicator, ConnectToEthernetSelectProfile)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createEthernetDevice(NM_DEVICE_STATE_DISCONNECTED);
+    auto homeConnection = createEthernetConnection("Home", device);
+    auto roamingConnection = createEthernetConnection("Roaming", device);
+    auto workConnection = createEthernetConnection("Work", device);
+    OrgFreedesktopNetworkManagerDeviceInterface deviceInterface(NM_DBUS_SERVICE, device, dbusTestRunner.systemConnection());
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_FALSE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_DISCONNECTED, deviceInterface.state());
+    QDBusObjectPath activeConnection = deviceInterface.activeConnection();
+    EXPECT_EQ("/", activeConnection.path().toStdString());
+
+    // First select a different profile
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                )
+                .item(radio("Home", Toggle::enabled))
+                .item(radio("Roaming", Toggle::disabled))
+                .item(radio("Work", Toggle::disabled).activate())
+            )
+        ).match());
+
+    // Now connect
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                    .activate()
+                )
+                .item(radio("Home", Toggle::disabled))
+                .item(radio("Roaming", Toggle::disabled))
+                .item(radio("Work", Toggle::enabled))
+            )
+        ).match());
+
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .state_icons({"gsm-3g-full", "network-wired-connected"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Connected",
+                      Toggle::enabled)
+                )
+                .item(radio("Home", Toggle::disabled))
+                .item(radio("Roaming", Toggle::disabled))
+                .item(radio("Work", Toggle::enabled))
+            )
+        ).match());
+
+    EXPECT_TRUE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_ACTIVATED, deviceInterface.state());
+    activeConnection = deviceInterface.activeConnection();
+    ASSERT_NE("/", activeConnection.path().toStdString());
+
+    // Check we're connected to the "Work" profile
+    OrgFreedesktopNetworkManagerConnectionActiveInterface activeConnectionInterface(NM_DBUS_SERVICE, activeConnection.path(), dbusTestRunner.systemConnection());
+    auto connection = activeConnectionInterface.connection();
+    EXPECT_EQ(workConnection, connection.path());
+}
+
+
+TEST_F(TestIndicator, DisconnectFromEthernet)
+{
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createEthernetDevice(NM_DEVICE_STATE_ACTIVATED);
+    auto connection = createEthernetConnection("Home", device);
+    createActiveConnection("0", device, connection);
+    OrgFreedesktopNetworkManagerDeviceInterface deviceInterface(NM_DBUS_SERVICE, device, dbusTestRunner.systemConnection());
+
+    ASSERT_NO_THROW(startIndicator());
+
+    EXPECT_TRUE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_ACTIVATED, deviceInterface.state());
+    QDBusObjectPath activeConnection = deviceInterface.activeConnection();
+    EXPECT_NE("/", activeConnection.path().toStdString());
+
+    auto& deviceMockInterface = dbusMock.mockInterface(NM_DBUS_SERVICE, device, NM_DBUS_INTERFACE_DEVICE, QDBusConnection::SystemBus);
+    QSignalSpy deviceSpy(&deviceMockInterface, SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "network-wired-connected"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Connected",
+                      Toggle::enabled)
+                    .activate()
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"gsm-3g-full", "nm-no-connection"})
+            .submenu()
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()) // <-- modems are under here
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(ethernetInfo("Ethernet",
+                      "Disconnected",
+                      Toggle::disabled)
+                )
+            )
+            .item(ethernetSettings())
+            .item(mh::MenuItemMatcher()
+                .section()
+            )
+        ).match());
+
+    WAIT_FOR_SIGNALS(deviceSpy, 1);
+    ASSERT_EQ(1, deviceSpy.size());
+    {
+        auto & call = deviceSpy.at(0);
+        EXPECT_EQ("Disconnect", call.at(0).toString());
+    }
+
+    EXPECT_FALSE(deviceInterface.autoconnect());
+    EXPECT_EQ(NM_DEVICE_STATE_DISCONNECTED, deviceInterface.state());
+    activeConnection = deviceInterface.activeConnection();
+    EXPECT_EQ("/", activeConnection.path().toStdString());
 }
 
 TEST_F(TestIndicator, OneDisconnectedAccessPointAtStartup)
@@ -202,8 +634,6 @@
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
-            .item(wifiEnableSwitch())
-            .item(wifiSettings())
             .item(mh::MenuItemMatcher()
                 .section()
             )