fix rebaseHEADmain

1 files changed, 5 insertions, 64 deletions

diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 23e795e..9047174 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -112,24 +112,6 @@ Item {
                     }
 
                     CollapsibleSection {
-                        id: vpnListSection
-
-                        Layout.fillWidth: true
-                        title: qsTr("VPN")
-                        expanded: true
-
-                        Loader {
-                            Layout.fillWidth: true
-                            sourceComponent: Component {
-                                VpnList {
-                                    session: root.session
-                                    showHeader: false
-                                }
-                            }
-                        }
-                    }
-
-                    CollapsibleSection {
                         id: ethernetListSection
 
                         Layout.fillWidth: true
@@ -171,17 +153,15 @@ Item {
         rightContent: Component {
             Item {
                 id: rightPaneItem
-                
-                property var vpnPane: root.session && root.session.vpn ? root.session.vpn.active : null
+
                 property var ethernetPane: root.session && root.session.ethernet ? root.session.ethernet.active : null
                 property var wirelessPane: root.session && root.session.network ? root.session.network.active : null
-                property var pane: vpnPane || ethernetPane || wirelessPane
-                property string paneId: vpnPane ? ("vpn:" + (vpnPane.name || "")) : (ethernetPane ? ("eth:" + (ethernetPane.interface || "")) : (wirelessPane ? ("wifi:" + (wirelessPane.ssid || wirelessPane.bssid || "")) : "settings"))
+                property var pane: ethernetPane || wirelessPane
+                property string paneId: ethernetPane ? ("eth:" + (ethernetPane.interface || "")) : (wirelessPane ? ("wifi:" + (wirelessPane.ssid || wirelessPane.bssid || "")) : "settings")
                 property Component targetComponent: settingsComponent
                 property Component nextComponent: settingsComponent
 
                 function getComponentForPane() {
-                    if (vpnPane) return vpnDetailsComponent;
                     if (ethernetPane) return ethernetDetailsComponent;
                     if (wirelessPane) return wirelessDetailsComponent;
                     return settingsComponent;
@@ -193,27 +173,12 @@ Item {
                 }
 
                 Connections {
-                    target: root.session && root.session.vpn ? root.session.vpn : null
-                    enabled: target !== null
-                    
-                    function onActiveChanged() {
-                        // Clear others when VPN is selected
-                        if (root.session && root.session.vpn && root.session.vpn.active) {
-                            if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null;
-                            if (root.session.network && root.session.network.active) root.session.network.active = null;
-                        }
-                        rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
-                    }
-                }
-
-                Connections {
                     target: root.session && root.session.ethernet ? root.session.ethernet : null
                     enabled: target !== null
-                    
+
                     function onActiveChanged() {
                         // Clear others when ethernet is selected
                         if (root.session && root.session.ethernet && root.session.ethernet.active) {
-                            if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null;
                             if (root.session.network && root.session.network.active) root.session.network.active = null;
                         }
                         rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
@@ -223,11 +188,10 @@ Item {
                 Connections {
                     target: root.session && root.session.network ? root.session.network : null
                     enabled: target !== null
-                    
+
                     function onActiveChanged() {
                         // Clear others when wireless is selected
                         if (root.session && root.session.network && root.session.network.active) {
-                            if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null;
                             if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null;
                         }
                         rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
@@ -333,29 +297,6 @@ Item {
         }
     }
 
-    Component {
-        id: vpnDetailsComponent
-
-        StyledFlickable {
-            id: vpnFlickable
-            flickableDirection: Flickable.VerticalFlick
-            contentHeight: vpnDetailsInner.height
-
-            StyledScrollBar.vertical: StyledScrollBar {
-                flickable: vpnFlickable
-            }
-
-            VpnDetails {
-                id: vpnDetailsInner
-
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                session: root.session
-            }
-        }
-    }
-
     WirelessPasswordDialog {
         anchors.fill: parent
         session: root.session