Merge lp:~larsu/qmenumodel/add-nameowner-property into lp:qmenumodel

[Lars Karlitski]

unitymenumodel: add nameOwner property

unitymenumodel: add nameOwner property

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/51/rebuild

review: Approve (continuous-integration)

[Mirco Müller (macslow)]

Looks good to me... and helps me with sorting out https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1308011

review: Approve

[lp:~larsu/qmenumodel/add-nameowner-property]

111. By Lars Karlitski on 2014-07-15

Update changelog

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 07:38:12 +0000
+++ debian/changelog	2014-07-15 16:11:58 +0000
@@ -1,3 +1,9 @@
+qmenumodel (0.2.8-0ubuntu1) UNRELEASED; urgency=medium
+
+  * unitymenumodel: add nameOwner property
+
+ -- Lars Uebernickel <[e-mail]>  Tue, 15 Jul 2014 18:10:54 +0200
+
 qmenumodel (0.2.7+14.10.20140704-0ubuntu1) utopic; urgency=low
 
   [ Charles Kerr ]

=== modified file 'libqmenumodel/src/unitymenumodel.cpp'
--- libqmenumodel/src/unitymenumodel.cpp	2014-06-30 17:42:42 +0000
+++ libqmenumodel/src/unitymenumodel.cpp	2014-07-15 16:11:58 +0000
@@ -170,6 +170,8 @@
 
     this->updateActions();
     this->updateMenuModel();
+
+    Q_EMIT model->nameOwnerChanged (this->nameOwner);
 }
 
 void UnityMenuModelPrivate::updateActions()
@@ -231,6 +233,8 @@
 
     priv->updateActions();
     priv->updateMenuModel();
+
+    Q_EMIT priv->model->nameOwnerChanged (priv->nameOwner);
 }
 
 void UnityMenuModelPrivate::nameVanished(GDBusConnection *connection, const gchar *name, gpointer user_data)
@@ -295,6 +299,11 @@
     return priv->busName;
 }
 
+QByteArray UnityMenuModel::nameOwner() const
+{
+    return priv->nameOwner;
+}
+
 void UnityMenuModel::setBusName(const QByteArray &name)
 {
     if (name == priv->busName)
@@ -309,6 +318,7 @@
                                           UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished,
                                           priv, NULL);
     priv->busName = name;
+    Q_EMIT busNameChanged (priv->busName);
 }
 
 QVariantMap UnityMenuModel::actions() const

=== modified file 'libqmenumodel/src/unitymenumodel.h'
--- libqmenumodel/src/unitymenumodel.h	2013-09-03 10:02:47 +0000
+++ libqmenumodel/src/unitymenumodel.h	2014-07-15 16:11:58 +0000
@@ -28,6 +28,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
+    Q_PROPERTY(QByteArray nameOwner READ nameOwner NOTIFY nameOwnerChanged)
     Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
     Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
     Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
@@ -39,6 +40,8 @@
     QByteArray busName() const;
     void setBusName(const QByteArray &name);
 
+    QByteArray nameOwner() const;
+
     QVariantMap actions() const;
     void setActions(const QVariantMap &actions);
 
@@ -67,6 +70,7 @@
 
 Q_SIGNALS:
     void busNameChanged(const QByteArray &name);
+    void nameOwnerChanged(const QByteArray &owner);
     void actionsChanged(const QByteArray &path);
     void menuObjectPathChanged(const QByteArray &path);
     void actionStateParserChanged(ActionStateParser* parser);