Merge lp:~saviq/unity8/drop-network-agents into lp:unity8

[Michał Sawicz]

Drop network agents now that they're in indicator-network instead.

[lp:~saviq/unity8/drop-network-agents]

249. By Michał Sawicz on 2013-10-01

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/unity8-ci/1205/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4307
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2015
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1981
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1205
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1204
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2017/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1705
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1722

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1205/rebuild

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/drop-network-agents]

250. By Michał Sawicz on 2013-10-03

merge trunk

251. By Michał Sawicz on 2013-10-03

One more cleanup.

252. By Michał Sawicz on 2013-10-03

One more unneeded line.

253. By Michał Sawicz on 2013-10-03

Add Breaks: for indicator-network, so that we don't end up with no password agent on upgrade.

254. By Michał Sawicz on 2013-10-03

merge version bump

Unmerged revisions

=== renamed file 'Greeter/PinLockscreen.qml' => 'Components/PinLockscreen.qml'
=== renamed file 'Greeter/PinPadButton.qml' => 'Components/PinPadButton.qml'
=== modified file 'Notifications/Notification.qml'
--- Notifications/Notification.qml	2013-07-18 09:03:11 +0000
+++ Notifications/Notification.qml	2013-10-01 19:26:43 +0000
@@ -17,6 +17,8 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Unity.Notifications 1.0
+import QMenuModel 0.1
+import Utils 0.1
 
 UbuntuShape {
     id: notification
@@ -38,6 +40,24 @@
 
     clip: true
 
+    UnityMenuModelPaths {
+        id: paths
+
+        source: hints["x-canonical-private-menu-model"]
+
+        busNameHint: "busName"
+        actionsHint: "actions"
+        menuObjectPathHint: "menuPath"
+    }
+
+    UnityMenuModel {
+        id: unityMenuModel
+
+        busName: paths.busName
+        actions: paths.actions
+        menuObjectPath: paths.menuObjectPath
+    }
+
     Behavior on implicitHeight {
         id: heightBehavior
 
@@ -141,6 +161,27 @@
             }
         }
 
+        Column {
+            objectName: "dialogListView"
+            spacing: units.gu(2)
+
+            visible: count > 0
+
+            anchors.left: parent.left; anchors.right: parent.right
+
+            Repeater {
+                model: unityMenuModel
+
+                NotificationMenuItemFactory {
+                    anchors.left: parent.left; anchors.right: parent.right
+
+                    menuModel: unityMenuModel
+                    menuData: model
+                    menuIndex: index
+                }
+            }
+        }
+
         Item {
             id: buttonRow
 
@@ -195,7 +236,7 @@
                     top: parent.top
                     bottom: parent.bottom
                 }
-                gradient: notification.hints == Notification.ButtonTint ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient
+                gradient: notification.hints["x-canonical-private-button-tint"] == "true" ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient
                 visible: width > 0
                 onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
             }

=== added file 'Notifications/NotificationMenuItemFactory.qml'
--- Notifications/NotificationMenuItemFactory.qml	1970-01-01 00:00:00 +0000
+++ Notifications/NotificationMenuItemFactory.qml	2013-10-01 19:26:43 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../Components"
+
+Loader {
+    id: menuFactory
+
+    property QtObject menuModel: null
+    property QtObject menuData: null
+    property int menuIndex
+    property var notification
+
+    property var _map:  {
+        "com.canonical.snapdecision.textfield": textfield,
+        "com.canonical.snapdecision.pinlock" : pinLock,
+    }
+
+    sourceComponent: {
+        if (menuData.type !== undefined) {
+            var component = _map[menuData.type];
+            if (component !== undefined) {
+                return component;
+            }
+        } else {
+            if (menuData.isSeparator) {
+                return divMenu;
+            }
+        }
+        return standardMenu;
+    }
+
+    Component {
+        id: textfield
+
+        Column {
+            spacing: units.gu(.5)
+
+            anchors.left: parent.left; anchors.right: parent.right
+
+            Component.onCompleted: {
+                menuModel.loadExtendedAttributes(menuIndex, {"x-echo-mode-password": "bool"});
+                textfield.echoMode = menuData.ext.xEchoModePassword ? TextInput.Password : TextInput.Normal
+            }
+
+            Label {
+                fontSize: "medium"
+                color: "white"
+                text: menuData.label
+            }
+
+            TextField {
+                id: textfield
+
+                anchors.left: parent.left; anchors.right: parent.right
+
+                onTextChanged: {
+                    menuModel.changeState(menuIndex, text);
+                }
+            }
+        }
+    }
+
+    Component {
+        id: pinLock
+        PinLockscreen {
+            anchors.left: parent.left; anchors.right: parent.right
+
+            onEntered: {
+                menuModel.changeState(menuIndex, passphrase);
+            }
+
+            onCancel: {
+                menuModel.activate(menuIndex, false);
+            }
+        }
+    }
+}

=== removed file 'Panel/Indicators/NetworkIndicatorPage.qml'
--- Panel/Indicators/NetworkIndicatorPage.qml	2013-09-09 09:21:55 +0000
+++ Panel/Indicators/NetworkIndicatorPage.qml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-import Unity.Indicators.Network 0.1 as ICNetwork
-import Ubuntu.Components 0.1
-
-PageStack {
-    id: networkPage
-    // Stops the search for a parent tree node.
-    // We don't want it going up to the indicator tabs.
-    // FIXME: need a better way of doing this.
-    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704
-    __propagated: null
-
-    property alias title: _mainPage.title
-    property alias emptyText: pluginItem.emptyText
-    property alias busName: pluginItem.busName
-    property alias actionsObjectPath : pluginItem.actionsObjectPath
-    property alias menuObjectPaths : pluginItem.menuObjectPaths
-
-    anchors.fill: parent
-
-    Page {
-        id: _mainPage
-
-        Indicators.IndicatorPage {
-            id: pluginItem
-            anchors.fill: parent
-        }
-    }
-
-    Component {
-        id: passwordPageComponent
-
-        ICNetwork.PasswordPage {
-            agent: networkAgent
-        }
-    }
-
-    ICNetwork.NetworkAgent {
-        id: networkAgent
-
-        onSecretRequested: {
-            networkPage.push(passwordPageComponent, {"token": token});
-        }
-    }
-
-    function start()
-    {
-        push(_mainPage);
-        pluginItem.start();
-    }
-
-    function stop()
-    {
-        clear();
-        pluginItem.stop();
-    }
-
-    function reset()
-    {
-        pluginItem.reset();
-    }
-}

=== modified file 'Panel/IndicatorsDataModel.qml'
--- Panel/IndicatorsDataModel.qml	2013-09-09 09:21:55 +0000
+++ Panel/IndicatorsDataModel.qml	2013-10-01 19:26:43 +0000
@@ -46,8 +46,6 @@
         'indicator-network' : {
             'title': 'Networks',
             'description' : '',
-            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',
-            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'
         },
         'indicator-power' : {
             'title': 'Battery',

=== modified file 'debian/control'
--- debian/control	2013-09-26 15:23:37 +0000
+++ debian/control	2013-10-01 19:26:43 +0000
@@ -14,8 +14,6 @@
                libjson-perl,
                libnih-dbus-dev,
                libnih-dev,
-               libnm-glib-dev,
-               libnm-util-dev,
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5v8-5-private-dev,
@@ -80,10 +78,7 @@
          unity8-private | unity-launcher-impl,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: indicator-battery,
-            indicator-messages,
-            indicator-time,
-            ${unity-default-masterscopes},
+Recommends: ${unity-default-masterscopes},
 Description: Unity 8 shell
  The Unity 8 shell is the primary user interface for Ubuntu devices.
 

=== modified file 'plugins/Unity/Indicators/Network/CMakeLists.txt'
--- plugins/Unity/Indicators/Network/CMakeLists.txt	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/Network/CMakeLists.txt	2013-10-01 19:26:43 +0000
@@ -1,45 +1,1 @@
-# export_qmlplugin macro
-include(Plugins)
-
-project(IndicatorsNetworkQml)
-
-pkg_check_modules(GLIB glib-2.0>=2.32)
-pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
-pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
-
-if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
-    set(INDICATORS_NETWORK_SRC
-        networkagent.cpp
-        plugin.cpp
-        secret-agent.c
-    )
-
-    add_library(IndicatorsNetworkQml MODULE
-        ${INDICATORS_NETWORK_SRC}
-    )
-
-    qt5_use_modules(IndicatorsNetworkQml Core Qml Widgets)
-
-    set_target_properties(IndicatorsNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
-
-    include_directories(
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${GLIB_INCLUDE_DIRS}
-        ${LIBNM_GLIB_INCLUDE_DIRS}
-        ${LIBNM_UTIL_INCLUDE_DIRS}
-    )
-
-    target_link_libraries(IndicatorsNetworkQml
-        ${GLIB_LIBRARIES}
-        ${LIBNM_GLIB_LIBRARIES}
-        ${LIBNM_UTIL_LIBRARIES}
-    )
-
-    # export the qmltypes and plugin files
-    export_qmlplugin(Unity.Indicators.Network 0.1 Unity/Indicators/Network TARGETS IndicatorsNetworkQml)
-
-else()
-    message(WARNING "Missing glib or libnm dependency for the network plugin, not building")
-endif()
-
 add_subdirectory(qml)

=== removed file 'plugins/Unity/Indicators/Network/networkagent.cpp'
--- plugins/Unity/Indicators/Network/networkagent.cpp	2013-06-07 12:51:16 +0000
+++ plugins/Unity/Indicators/Network/networkagent.cpp	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *     Alberto Ruiz <[e-mail]>
- *     Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-#include "networkagent.h"
-
-#include <QVariant>
-#include <QApplication>
-#include <QDebug>
-
-class NetworkAgentToken
-{
-public:
-    NMConnection *connection;
-    NMSettingWirelessSecurity *wisec;
-    guint id;
-    QByteArray keyMgmt;
-
-    NetworkAgentToken(NMConnection *connection,
-                      NMSettingWirelessSecurity *wisec,
-                      guint id,
-                      QByteArray keyMgmt)
-        : connection(connection),
-          wisec(wisec),
-          id(id),
-          keyMgmt(keyMgmt)
-    {
-        if (connection) {
-            g_object_ref(connection);
-        } else {
-            qWarning() << "invalid connection object";
-        }
-    }
-
-    ~NetworkAgentToken()
-    {
-        if (connection) {
-            g_object_unref(connection);
-        }
-    }
-};
-
-NetworkAgent::NetworkAgent(QObject *parent)
-    : QObject(parent)
-{
-    m_agent = unity_settings_secret_agent_new();
-    g_signal_connect(G_OBJECT(m_agent),
-                     UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
-                     G_CALLBACK(onSecretRequested),
-                     this);
-
-    g_signal_connect(G_OBJECT(m_agent),
-                     UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
-                     G_CALLBACK(onSecretRequestCancelled),
-                     this);
-}
-
-NetworkAgent::~NetworkAgent()
-{
-    nm_secret_agent_unregister(NM_SECRET_AGENT(m_agent));
-    g_object_unref(m_agent);
-}
-
-void NetworkAgent::authenticate(const QVariant &token, const QString &key)
-{
-    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
-    if (pToken == NULL) {
-        return;
-    }
-
-    if ((pToken->keyMgmt == "wpa-none") || (pToken->keyMgmt == "wpa-psk")) {
-        g_object_set(G_OBJECT(pToken->wisec),
-                     NM_SETTING_WIRELESS_SECURITY_PSK, qPrintable(key),
-                     NULL);
-    } else if (pToken->keyMgmt == "none") {
-        g_object_set(G_OBJECT(pToken->wisec),
-                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, qPrintable(key),
-                     NULL);
-    }
-
-    GHashTable *settings = nm_connection_to_hash(pToken->connection,
-                                                 NM_SETTING_HASH_FLAG_ALL);
-
-    unity_settings_secret_agent_provide_secret(m_agent,
-                                               pToken->id, settings);
-    g_hash_table_unref(settings);
-    delete pToken;
-}
-
-void NetworkAgent::cancel(const QVariant &token)
-{
-    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
-    if (pToken != NULL) {
-        unity_settings_secret_agent_cancel_request(m_agent, pToken->id);
-        delete pToken;
-    }
-}
-
-void NetworkAgent::onSecretRequested(UnitySettingsSecretAgent* /*agent*/,
-                                     guint         id,
-                                     NMConnection* connection,
-                                     const char* /*setting_name*/,
-                                     const char** /*hints*/,
-                                     NMSecretAgentGetSecretsFlags /*flags*/,
-                                     NetworkAgent* self)
-{
-    NetworkAgentToken *token = new NetworkAgentToken(connection,
-                                                     NULL,
-                                                     id,
-                                                     NULL);
-
-    token->wisec = nm_connection_get_setting_wireless_security(connection);
-    if (token->wisec) {
-        token->keyMgmt = nm_setting_wireless_security_get_key_mgmt(token->wisec);
-    }
-
-    QVariant varToken = qVariantFromValue((void *) token);
-    Q_EMIT self->secretRequested(varToken);
-}
-
-void NetworkAgent::onSecretRequestCancelled(UnitySettingsSecretAgent* /*agent*/,
-                                            guint         /*id*/,
-                                            NMConnection* /*connection*/,
-                                            const char* /*setting_name*/,
-                                            const char** /*hints*/,
-                                            NMSecretAgentGetSecretsFlags /*flags*/,
-                                            NetworkAgent* /*self*/)
-{
-    //Do nothing for now
-}

=== removed file 'plugins/Unity/Indicators/Network/networkagent.h'
--- plugins/Unity/Indicators/Network/networkagent.h	2013-06-07 12:51:16 +0000
+++ plugins/Unity/Indicators/Network/networkagent.h	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *     Alberto Ruiz <[e-mail]>
- *     Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-#ifndef NETWORKAGENT_H
-#define NETWORKAGENT_H
-
-#include "secret-agent.h"
-
-#include <QObject>
-
-class NetworkAgentToken;
-
-class NetworkAgent : public QObject
-{
-    Q_OBJECT
-public:
-    NetworkAgent(QObject *parent=0);
-    ~NetworkAgent();
-
-    Q_INVOKABLE void authenticate(const QVariant &token, const QString &key);
-    Q_INVOKABLE void cancel(const QVariant &token);
-
-Q_SIGNALS:
-    void secretRequested(const QVariant &token);
-    void secretRequestCancelled();
-
-private:
-    UnitySettingsSecretAgent *m_agent;
-
-    static void onSecretRequested(UnitySettingsSecretAgent *agent,
-                                  guint   id,
-                                  NMConnection *connection,
-                                  const char *setting_name,
-                                  const char **hints,
-                                  NMSecretAgentGetSecretsFlags flags,
-                                  NetworkAgent *self);
-
-    static void onSecretRequestCancelled(UnitySettingsSecretAgent *agent,
-                                         guint          id,
-                                         NMConnection *connection,
-                                         const char *setting_name,
-                                         const char **hints,
-                                         NMSecretAgentGetSecretsFlags flags,
-                                         NetworkAgent *self);
-
-};
-
-#endif

=== removed file 'plugins/Unity/Indicators/Network/plugin.cpp'
--- plugins/Unity/Indicators/Network/plugin.cpp	2013-08-23 11:56:44 +0000
+++ plugins/Unity/Indicators/Network/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Nick Dedekind <[e-mail]>
- */
-
-// Qt
-#include <QtQml/qqml.h>
-
-// self
-#include "plugin.h"
-
-// local
-#include "networkagent.h"
-
-void IndicatorsNetworkPlugin::registerTypes(const char *uri)
-{
-    qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
-}

=== removed file 'plugins/Unity/Indicators/Network/plugin.h'
--- plugins/Unity/Indicators/Network/plugin.h	2013-06-17 08:14:24 +0000
+++ plugins/Unity/Indicators/Network/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Nick Dedekind <[e-mail]>
- */
-
-#ifndef INDICATORS_NETWORK_PLUGIN_H
-#define INDICATORS_NETWORK_PLUGIN_H
-
-#include <QtQml/QQmlExtensionPlugin>
-
-class IndicatorsNetworkPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif // INDICATORS_NETWORK_PLUGIN_H

=== removed file 'plugins/Unity/Indicators/Network/qml/PasswordPage.qml'
--- plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-08-21 21:00:17 +0000
+++ plugins/Unity/Indicators/Network/qml/PasswordPage.qml	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Unity.Indicators 0.1 as Indicators
-
-Page {
-    id: pagePassword
-
-    property variant agent
-    property variant token
-
-    anchors.fill: parent
-    title: "Network Authentication"
-
-    Column {
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        Indicators.SectionMenuItem {
-            text: "Authentication"
-        }
-
-        Indicators.FramedMenuItem {
-            implicitHeight: password.height + units.gu(1)
-
-            PasswordTextField {
-                id: password
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(3)
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-        }
-
-        Indicators.FramedMenuItem {
-            Row {
-                anchors {
-                    right: parent.right
-                    verticalCenter: parent.verticalCenter
-                    margins: units.gu(3)
-                }
-
-                spacing: units.gu(1)
-
-                Button {
-                    text: "Cancel"
-                    width: units.gu(10)
-                    onClicked: {
-                        agent.cancel(token);
-                        pageStack.pop();
-                    }
-                }
-
-                Button {
-                    text: "OK"
-                    width: units.gu(10)
-                    onClicked: {
-                        agent.authenticate(token, password.text);
-                        pageStack.pop();
-                    }
-                }
-            }
-        }
-    }
-}

=== removed file 'plugins/Unity/Indicators/Network/qml/PasswordTextField.qml'
--- plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	2013-07-05 15:05:28 +0000
+++ plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Item {
-    id: textMenu
-
-    property alias text: textField.text
-
-    height: contentColumn.height
-
-    Column {
-        id: contentColumn
-        spacing: units.gu(0.5)
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        TextField {
-            id: textField
-
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-
-            placeholderText: "Password"
-            echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
-        }
-
-        Row {
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-
-            spacing: units.gu(1)
-
-            CheckBox {
-                id: showPassword
-            }
-
-            Label {
-                text: "Show password"
-                anchors.verticalCenter: showPassword.verticalCenter
-            }
-        }
-    }
-}

=== modified file 'plugins/Unity/Indicators/Network/qml/qmldir'
--- plugins/Unity/Indicators/Network/qml/qmldir	2013-08-21 21:00:17 +0000
+++ plugins/Unity/Indicators/Network/qml/qmldir	2013-10-01 19:26:43 +0000
@@ -2,7 +2,4 @@
 plugin IndicatorsNetworkQml
 typeinfo plugin.qmltypes
 
-NetworkPage 0.1 NetworkPage.qml
 AccessPoint 0.1 AccessPoint.qml
-PasswordPage 0.1 PasswordPage.qml
-PasswordTextField 0.1 PasswordTextField.qml
\ No newline at end of file

=== removed file 'plugins/Unity/Indicators/Network/secret-agent.c'
--- plugins/Unity/Indicators/Network/secret-agent.c	2013-06-07 12:51:16 +0000
+++ plugins/Unity/Indicators/Network/secret-agent.c	1970-01-01 00:00:00 +0000
@@ -1,382 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *     Alberto Ruiz <[e-mail]>
- *     Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <nm-secret-agent.h>
-#include "secret-agent.h"
-
-#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
-#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
-#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
-#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
-#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
-#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
-#define UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentPrivate))
-
-#define AGENT_ID "com.canonical.settings.network.nm-agent"
-
-static gpointer unity_settings_secret_agent_parent_class = NULL;
-
-typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
-
-struct _UnitySettingsSecretAgentPrivate {
-  GQueue  *requests;
-};
-
-typedef struct _SecretRequest {
-  gint                           id;
-  NMSecretAgent                 *agent;
-  NMConnection                  *connection;
-  const char                    *connection_path;
-  const char                    *setting_name;
-  const char                   **hints;
-  NMSecretAgentGetSecretsFlags   flags;
-  NMSecretAgentGetSecretsFunc    callback;
-  gpointer                       callback_data;
-} SecretRequest;
-
-GType unity_settings_secret_agent_get_type (void) G_GNUC_CONST;
-enum  {
-    UNITY_SETTINGS_SECRET_AGENT_DUMMY_PROPERTY
-};
-
-enum {
-  SECRET_REQUESTED,
-  REQUEST_CANCELLED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
-UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
-
-int
-secret_request_find (SecretRequest  *req,
-                     guint          *id)
-{
-  if (req->id > *id)
-      return -1;
-
-  if (req->id < *id)
-      return 1;
-
-  return 0;
-}
-
-void
-unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
-                                            guint                     request,
-                                            GHashTable               *secrets)
-{
-  GList                           *iter;
-  SecretRequest                   *req;
-  UnitySettingsSecretAgentPrivate *priv = agent->priv;
-
-  iter = g_queue_find_custom (priv->requests,
-                              &request,
-                              (GCompareFunc)secret_request_find);
-
-  if (iter == NULL || iter->data == NULL)
-    {
-      g_warning ("Secret request with id <%d> was not found", (int)request);
-      return;
-    }
-
-  req = iter->data;
-
-  req->callback (NM_SECRET_AGENT (agent),
-                 req->connection,
-                 secrets,
-                 NULL,
-                 req->callback_data);
-
-  g_queue_remove_all (priv->requests, req);
-  g_free (req);
-  return;
-}
-
-void
-free_request (SecretRequest *req)
-{
-  g_object_unref (req->connection);
-  g_free (req);
-}
-
-void
-unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
-                                            guint                     request)
-{
-  GList                           *iter;
-  SecretRequest                   *req;
-  UnitySettingsSecretAgentPrivate *priv = agent->priv;
-  GError *error;
-
-  iter = g_queue_find_custom (priv->requests,
-                              &request,
-                              (GCompareFunc)secret_request_find);
-
-  if (iter == NULL || iter->data == NULL)
-    {
-      g_warning ("Secret request with id <%d> was not found", (int)request);
-      return;
-    }
-
-  req = iter->data;
-  error = g_error_new (NM_SECRET_AGENT_ERROR,
-                       NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
-                       "This secret request was canceled by the user.");
-
-  req->callback (NM_SECRET_AGENT (agent),
-                 req->connection,
-                 NULL,
-                 error,
-                 req->callback_data);
-
-  g_queue_remove_all (priv->requests, req);
-  free_request (req);
-  return;
-}
-
-static void
-delete_secrets (NMSecretAgent *agent,
-                NMConnection *connection,
-                const char *connection_path,
-                NMSecretAgentDeleteSecretsFunc callback,
-                gpointer callback_data)
-{
-  g_debug ("delete secrets");
-}
-
-/* If it returns G_MAXUINT it's considered an error */
-static guint
-find_available_id (UnitySettingsSecretAgentPrivate *priv)
-{
-  guint i         = 0;
-  guint candidate = 0;
-
-  if (g_queue_get_length (priv->requests) == G_MAXUINT)
-    return G_MAXUINT;
-
-  while (i < g_queue_get_length (priv->requests))
-    {
-      SecretRequest *req = (SecretRequest*)g_queue_peek_nth (priv->requests, i);
-
-      if (req->id == candidate)
-      {
-        candidate++;
-        i = 0;
-      }
-      else
-      {
-        i++;
-      }
-    }
-
-  return i;
-}
-
-static void
-get_secrets (NMSecretAgent                 *agent,
-             NMConnection                  *connection,
-             const char                    *connection_path,
-             const char                    *setting_name,
-             const char                   **hints,
-             NMSecretAgentGetSecretsFlags   flags,
-             NMSecretAgentGetSecretsFunc    callback,
-             gpointer                       callback_data)
-{
-  guint   id;
-  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
-  SecretRequest *req = NULL;
-
-  if (flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE)
-    {
-      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
-                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
-                                   "No password found for this connection.");
-      callback (agent, connection, NULL, error, callback_data);
-      g_error_free (error);
-      return;
-    }
-
-  id = find_available_id (priv);
-  if (id == G_MAXUINT)
-    {
-      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
-                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
-                                   "Reached maximum number of requests.");
-      callback (agent, connection, NULL, error, callback_data);
-      g_error_free (error);
-      return;
-    }
-
-  /* Adding a request */
-  req = (SecretRequest*) g_malloc0 (sizeof (SecretRequest));
-  *req = ((SecretRequest)
-          { id,
-            agent,
-            connection,
-            connection_path,
-            setting_name,
-            hints,
-            flags,
-            callback,
-            callback_data });
-
-  g_object_ref (connection);
-
-  g_queue_push_tail (priv->requests, req);
-
-  g_signal_emit_by_name (agent,
-                         UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
-                         id,
-                         connection,
-                         setting_name,
-                         hints,
-                         flags);
-}
-
-static void
-save_secrets (NMSecretAgent                *agent,
-              NMConnection                 *connection,
-              const char                   *connection_path,
-              NMSecretAgentSaveSecretsFunc  callback,
-              gpointer                      callback_data)
-{
-  g_debug ("save secrets");
-}
-
-static void
-cancel_get_secrets (NMSecretAgent *agent,
-                    const char *connection_path,
-                    const char *setting_name)
-{
-  g_debug ("cancel get secrets");
-}
-
-UnitySettingsSecretAgent*
-unity_settings_secret_agent_construct (GType object_type)
-{
-  UnitySettingsSecretAgent * self = NULL;
-  self = (UnitySettingsSecretAgent*) g_object_new (object_type,
-                                                   NM_SECRET_AGENT_IDENTIFIER, AGENT_ID,
-                                                   NULL);
-  return self;
-}
-
-
-UnitySettingsSecretAgent*
-unity_settings_secret_agent_new (void)
-{
-  return unity_settings_secret_agent_construct (UNITY_SETTINGS_TYPE_SECRET_AGENT);
-}
-
-static void
-destroy_pending_request (gpointer data)
-{
-  SecretRequest* req = (SecretRequest*)data;
-  /* Reporting the cancellation of all pending requests */
-  g_signal_emit_by_name (req->agent,
-                         UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
-                         req->id);
-
-  free_request (req);
-}
-
-static void
-unity_settings_secret_agent_finalize (GObject *agent)
-{
-  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
-
-  g_queue_free_full (priv->requests, destroy_pending_request);
-}
-
-static void
-unity_settings_secret_agent_class_init (UnitySettingsSecretAgentClass *klass)
-{
-  unity_settings_secret_agent_parent_class = g_type_class_peek_parent (klass);
-  NMSecretAgentClass         *parent_class = NM_SECRET_AGENT_CLASS (klass);
-  parent_class->get_secrets = get_secrets;
-  parent_class->save_secrets = save_secrets;
-  parent_class->delete_secrets = delete_secrets;
-  parent_class->cancel_get_secrets = cancel_get_secrets;
-
-  g_type_class_add_private (klass, sizeof(UnitySettingsSecretAgentPrivate));
-  G_OBJECT_CLASS (klass)->finalize = unity_settings_secret_agent_finalize;
-
-
-  signals[SECRET_REQUESTED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
-                                            G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
-                                            G_SIGNAL_RUN_FIRST,
-                                            G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, secret_requested),
-                                            NULL, NULL, NULL,
-                                            G_TYPE_NONE, 5,
-                                            G_TYPE_UINT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT);
-
-  signals[REQUEST_CANCELLED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
-                                             G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
-                                             G_SIGNAL_RUN_FIRST,
-                                             G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, request_cancelled),
-                                             NULL, NULL, NULL,
-                                             G_TYPE_NONE, 1,
-                                             G_TYPE_UINT);
-}
-
-
-static void
-unity_settings_secret_agent_instance_init (UnitySettingsSecretAgent *self)
-{
-  self->priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (self);
-  self->priv->requests = g_queue_new ();
-}
-
-GType
-unity_settings_secret_agent_get_type (void)
-{
-  static volatile gsize unity_settings_secret_agent_type_id__volatile = 0;
-  if (g_once_init_enter (&unity_settings_secret_agent_type_id__volatile))
-    {
-      static const GTypeInfo g_define_type_info =
-        {
-          sizeof (UnitySettingsSecretAgentClass),
-          (GBaseInitFunc) NULL,
-          (GBaseFinalizeFunc) NULL,
-          (GClassInitFunc) unity_settings_secret_agent_class_init,
-          (GClassFinalizeFunc) NULL,
-          NULL,
-          sizeof (UnitySettingsSecretAgent),
-          0,
-          (GInstanceInitFunc) unity_settings_secret_agent_instance_init,
-          NULL
-        };
-      GType unity_settings_secret_agent_type_id;
-      unity_settings_secret_agent_type_id = g_type_register_static (NM_TYPE_SECRET_AGENT,
-                                                                    "UnitySettingsSecretAgent",
-                                                                    &g_define_type_info,
-                                                                    0);
-      g_once_init_leave (&unity_settings_secret_agent_type_id__volatile,
-                         unity_settings_secret_agent_type_id);
-    }
-
-  return unity_settings_secret_agent_type_id__volatile;
-}

=== removed file 'plugins/Unity/Indicators/Network/secret-agent.h'
--- plugins/Unity/Indicators/Network/secret-agent.h	2013-06-07 12:51:16 +0000
+++ plugins/Unity/Indicators/Network/secret-agent.h	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright 2013 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 as published by
- * the Free Software Foundation; version 3.
- *
- * 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:
- *     Alberto Ruiz <[e-mail]>
- *     Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-#ifndef __SECRET_AGENT_H__
-#define __SECRET_AGENT_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <nm-secret-agent.h>
-
-/*
- * This class is a basic implementation of the NetworkManager SecretAgent base class.
- *
- * The purpose of this class is to handle credential requests from the network,
- * for example, from a WiFi hotspot or a VPN network.
- *
- * It queues requests objects (SecretRequest) on a GQueue in the private struct
- * of the class. And notifies the consumer of the class through the "secret-request"
- * and the "request-cancelled" signals with the following callback prototypes:
- *
- * void  (*secret_requested) (UnitySettingsSecretAgent      *self,
- *                            guint                        id,
- *                            NMConnection                  *connection,
- *                            const char                    *setting_name,
- *                            const char                   **hints,
- *                            NMSecretAgentGetSecretsFlags   flags,
- *                            gpointer                       user_data);
- *
- * void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
- *                             guint                        id,
- *                             gpointer                       user_data);
- *
- */
-
-
-G_BEGIN_DECLS
-
-
-#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
-#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
-#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
-#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
-#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
-#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
-
-#define UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED  "secret-requested"
-#define UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED "request-cancelled"
-
-typedef struct _UnitySettingsSecretAgent UnitySettingsSecretAgent;
-typedef struct _UnitySettingsSecretAgentClass UnitySettingsSecretAgentClass;
-typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
-
-struct _UnitySettingsSecretAgent {
-  NMSecretAgent parent_instance;
-  UnitySettingsSecretAgentPrivate * priv;
-};
-
-struct _UnitySettingsSecretAgentClass {
-  NMSecretAgentClass parent_class;
-
-  void  (*secret_requested) (UnitySettingsSecretAgent      *self,
-                             guint                          id,
-                             NMConnection                  *connection,
-                             const char                    *setting_name,
-                             const char                   **hints,
-                             NMSecretAgentGetSecretsFlags   flags);
-
-  void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
-                              guint                          id);
-};
-
-
-GType                     unity_settings_secret_agent_get_type  (void) G_GNUC_CONST;
-UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
-UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
-
-void unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
-                                                 guint                     request,
-                                                 GHashTable               *secrets);
-void unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
-                                                 guint                     request);
-
-G_END_DECLS
-
-#endif

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2013-07-08 15:12:28 +0000
+++ plugins/Utils/CMakeLists.txt	2013-10-01 19:26:43 +0000
@@ -9,6 +9,7 @@
     qlimitproxymodelqml.cpp
     qsortfilterproxymodelqml.cpp
     ubuntuwindow.cpp
+    unitymenumodelpaths.cpp
     plugin.cpp
     )
 
@@ -21,7 +22,7 @@
 # files directly in targets.
 set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
 
-qt5_use_modules(Utils-qml Qml Quick)
+qt5_use_modules(Utils-qml Qml Quick DBus)
 
 # export the qmldir qmltypes and plugin files
 export_qmlfiles(Utils Utils)

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2013-08-23 11:56:44 +0000
+++ plugins/Utils/plugin.cpp	2013-10-01 19:26:43 +0000
@@ -28,6 +28,7 @@
 #include "qlimitproxymodelqml.h"
 #include "qsortfilterproxymodelqml.h"
 #include "ubuntuwindow.h"
+#include "unitymenumodelpaths.h"
 
 static QObject* applicationsPathsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
   Q_UNUSED(engine);
@@ -41,6 +42,7 @@
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
+    qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
     qmlRegisterExtendedType<QQuickWindow, UbuntuWindow>(uri, 0, 1, "Window");
     qmlRegisterSingletonType<ApplicationPaths>(uri, 0, 1, "ApplicationPaths", applicationsPathsSingleton);
 }

=== added file 'plugins/Utils/unitymenumodelpaths.cpp'
--- plugins/Utils/unitymenumodelpaths.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/unitymenumodelpaths.cpp	2013-10-01 19:26:43 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+
+#include "unitymenumodelpaths.h"
+#include <QDBusArgument>
+
+static QVariant parseVariantData(const QVariant& var);
+
+const QDBusArgument &operator>>(const QDBusArgument &arg, QVariantMap &map)
+{
+    arg.beginMap();
+    map.clear();
+    while (!arg.atEnd()) {
+        QString key;
+        QVariant value;
+        arg.beginMapEntry();
+
+        arg >> key >> value;
+        map.insertMulti(key, parseVariantData(value)); // re-parse for qdbusargument
+
+        arg.endMapEntry();
+    }
+    arg.endMap();
+    return arg;
+}
+
+static QVariant parseVariantData(const QVariant& var) {
+    if ((int)var.type() == QMetaType::User && var.userType() == qMetaTypeId<QDBusArgument>()) {
+        QDBusArgument arg(var.value<QDBusArgument>());
+        if (arg.currentType() == QDBusArgument::MapType) {
+            QVariantMap map;
+            arg >> map;
+            return map;
+        }
+        return arg.asVariant();
+    }
+
+    return var;
+}
+
+UnityMenuModelPaths::UnityMenuModelPaths(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QVariant UnityMenuModelPaths::source() const
+{
+    return m_sourceData;
+}
+
+void UnityMenuModelPaths::setSource(const QVariant& data)
+{
+    if (m_sourceData != data) {
+        m_sourceData = data;
+        Q_EMIT sourceChanged();
+
+        updateData();
+    }
+}
+
+void UnityMenuModelPaths::updateData()
+{
+    QVariantMap dataMap = parseVariantData(m_sourceData).toMap();
+
+    if (!m_busNameHint.isEmpty() && dataMap.contains(m_busNameHint)) {
+        setBusName(dataMap[m_busNameHint].toByteArray());
+    } else {
+        setBusName("");
+    }
+
+    if (!m_menuObjectPathHint.isEmpty() && dataMap.contains(m_menuObjectPathHint)) {
+        setMenuObjectPath(dataMap[m_menuObjectPathHint].toByteArray());
+    } else {
+        setMenuObjectPath("");
+    }
+
+    if (!m_actionsHint.isEmpty() && dataMap.contains(m_actionsHint)) {
+        setActions(dataMap[m_actionsHint].toMap());
+    } else {
+        setActions(QVariantMap());
+    }
+}
+
+QByteArray UnityMenuModelPaths::busName() const
+{
+    return m_busName;
+}
+
+void UnityMenuModelPaths::setBusName(const QByteArray &name)
+{
+    if (m_busName != name) {
+        m_busName = name;
+        Q_EMIT busNameChanged();
+    }
+}
+
+QVariantMap UnityMenuModelPaths::actions() const
+{
+    return m_actions;
+}
+
+void UnityMenuModelPaths::setActions(const QVariantMap &actions)
+{
+    if (m_actions != actions) {
+        m_actions = actions;
+        Q_EMIT actionsChanged();
+    }
+}
+
+QByteArray UnityMenuModelPaths::menuObjectPath() const
+{
+    return m_menuObjectPath;
+}
+
+void UnityMenuModelPaths::setMenuObjectPath(const QByteArray &path)
+{
+    if (m_menuObjectPath != path) {
+        m_menuObjectPath = path;
+        Q_EMIT menuObjectPathChanged();
+    }
+}
+
+QByteArray UnityMenuModelPaths::busNameHint() const
+{
+    return m_busNameHint;
+}
+
+void UnityMenuModelPaths::setBusNameHint(const QByteArray &nameHint)
+{
+    if (m_busNameHint != nameHint) {
+        m_busNameHint = nameHint;
+        Q_EMIT busNameHintChanged();
+
+        updateData();
+    }
+}
+
+QByteArray UnityMenuModelPaths::actionsHint() const
+{
+    return m_actionsHint;
+}
+
+void UnityMenuModelPaths::setActionsHint(const QByteArray &actionsHint)
+{
+    if (m_actionsHint != actionsHint) {
+        m_actionsHint = actionsHint;
+        Q_EMIT actionsHintChanged();
+
+        updateData();
+    }
+}
+
+QByteArray UnityMenuModelPaths::menuObjectPathHint() const
+{
+    return m_menuObjectPathHint;
+}
+
+void UnityMenuModelPaths::setMenuObjectPathHint(const QByteArray &pathHint)
+{
+    if (m_menuObjectPathHint != pathHint) {
+        m_menuObjectPathHint = pathHint;
+        Q_EMIT menuObjectPathHintChanged();
+
+        updateData();
+    }
+}
\ No newline at end of file

=== added file 'plugins/Utils/unitymenumodelpaths.h'
--- plugins/Utils/unitymenumodelpaths.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/unitymenumodelpaths.h	2013-10-01 19:26:43 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef UNITY_MENU_MODEL_PATHS_H
+#define UNITY_MENU_MODEL_PATHS_H
+
+#include <QVariant>
+
+class UnityMenuModelPaths : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QByteArray busName READ busName NOTIFY busNameChanged)
+    Q_PROPERTY(QVariantMap actions READ actions NOTIFY actionsChanged)
+    Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath NOTIFY menuObjectPathChanged)
+
+    Q_PROPERTY(QByteArray busNameHint READ busNameHint WRITE setBusNameHint NOTIFY busNameHintChanged)
+    Q_PROPERTY(QByteArray actionsHint READ actionsHint WRITE setActionsHint NOTIFY actionsHintChanged)
+    Q_PROPERTY(QByteArray menuObjectPathHint READ menuObjectPathHint WRITE setMenuObjectPathHint NOTIFY menuObjectPathHintChanged)
+
+public:
+    explicit UnityMenuModelPaths(QObject *parent = 0);
+
+    QVariant source() const;
+    void setSource(const QVariant& data);
+
+    QByteArray busName() const;
+    QVariantMap actions() const;
+    QByteArray menuObjectPath() const;
+
+    QByteArray busNameHint() const;
+    QByteArray actionsHint() const;
+    QByteArray menuObjectPathHint() const;
+
+Q_SIGNALS:
+    void sourceChanged();
+    void busNameChanged();
+    void actionsChanged();
+    void menuObjectPathChanged();
+
+    void busNameHintChanged();
+    void actionsHintChanged();
+    void menuObjectPathHintChanged();
+
+private:
+    void setBusName(const QByteArray &name);
+    void setActions(const QVariantMap& actions);
+    void setMenuObjectPath(const QByteArray &path);
+
+    void setBusNameHint(const QByteArray& nameHint);
+    void setActionsHint(const QByteArray &actionsHint);
+    void setMenuObjectPathHint(const QByteArray &pathHint);
+
+    void updateData();
+
+    QVariant m_sourceData;
+    QByteArray m_busName;
+    QVariantMap m_actions;
+    QByteArray m_menuObjectPath;
+
+    QByteArray m_busNameHint;
+    QByteArray m_actionsHint;
+    QByteArray m_menuObjectPathHint;
+};
+
+#endif // UNITY_MENU_MODEL_PATHS_H

=== added file 'tests/mocks/QMenuModel/UnityMenuModel.qml'
--- tests/mocks/QMenuModel/UnityMenuModel.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/QMenuModel/UnityMenuModel.qml	2013-10-01 19:26:43 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *   Mirco Müller <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+QtObject {
+    property variant busName
+    property variant actions
+    property variant menuObjectPath
+}

=== modified file 'tests/mocks/QMenuModel/qmldir'
--- tests/mocks/QMenuModel/qmldir	2013-07-26 11:10:55 +0000
+++ tests/mocks/QMenuModel/qmldir	2013-10-01 19:26:43 +0000
@@ -1,2 +1,3 @@
 module QMenuModel
 QDBusActionGroup 0.1 QDBusActionGroup.qml
+UnityMenuModel 0.1 UnityMenuModel.qml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-09-25 14:13:46 +0000
+++ tests/qmltests/CMakeLists.txt	2013-10-01 19:26:43 +0000
@@ -63,7 +63,7 @@
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)
 add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_SOURCE_DIR}/tests/mocks)
+add_qml_test(Notifications Notifications IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_SOURCE_DIR}/tests/mocks)
 add_qml_test(Panel IndicatorRow)
 add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})