Merge lp:~nick-dedekind/qmenumodel/lp1199423 into lp:qmenumodel

[Michal Hruby]

Do not watch an empty busName & emit signals for parameter changes.

Do not watch an empty busName & emit signals for parameter changes.

[Nick Dedekind (nick-dedekind)]

Getting this message when qml initialising busName=""

(process:18007): GLib-GIO-CRITICAL **: g_bus_watch_name: assertion 'g_dbus_is_name (name)' failed

[Nick Dedekind (nick-dedekind)]

> Getting this message when qml initialising busName=""
>
> (process:18007): GLib-GIO-CRITICAL **: g_bus_watch_name: assertion
> 'g_dbus_is_name (name)' failed

That is, I fixed this issue.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Please retarget against https://code.launchpad.net/~indicator-applet-developers/qmenumodel/trunk which is now the new lp:qmenumodel

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

The changes look good to me, except for the ABI breakage in unitymenumodel.h

Are we sure that all of its consumers are only using the QML plug-in?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> The changes look good to me, except for the ABI breakage in unitymenumodel.h
>
> Are we sure that all of its consumers are only using the QML plug-in?

There are a few points where we used UnitMenuModel in it's C++ form, but only as a pointer.
Nothing used the actionsChanged signal though.

[Pete Woods (pete-woods)]

> > The changes look good to me, except for the ABI breakage in unitymenumodel.h
> >
> > Are we sure that all of its consumers are only using the QML plug-in?
>
> There are a few points where we used UnitMenuModel in it's C++ form, but only
> as a pointer.
> Nothing used the actionsChanged signal though.

Okay, so what's the rule regarding known "okay" ABI breakages then? Is it okay to skip the ABI version bump in this case?

[Nick Dedekind (nick-dedekind)]

> > > The changes look good to me, except for the ABI breakage in
> unitymenumodel.h
> > >
> > > Are we sure that all of its consumers are only using the QML plug-in?
> >
> > There are a few points where we used UnitMenuModel in it's C++ form, but
> only
> > as a pointer.
> > Nothing used the actionsChanged signal though.
>
> Okay, so what's the rule regarding known "okay" ABI breakages then? Is it okay
> to skip the ABI version bump in this case?

Is there an explicit ABI version? Or do you just mean bump to 0.2.8? If so, we can do that.

[Pete Woods (pete-woods)]

Well the ABI version is currently 0. If we're breaking it we should probably up this to 1, I'd have thought.

[Albert Astals Cid (aacid)]

Text conflict in libqmenumodel/src/unitymenumodel.cpp
Text conflict in libqmenumodel/src/unitymenumodel.h
2 conflicts encountered.

Unmerged revisions

97. By Nick Dedekind on 2013-11-19

Better management of busName & parameter changes.

=== modified file 'libqmenumodel/src/unitymenumodel.cpp'
--- libqmenumodel/src/unitymenumodel.cpp	2013-10-14 16:31:14 +0000
+++ libqmenumodel/src/unitymenumodel.cpp	2013-11-22 13:51:15 +0000
@@ -292,15 +292,23 @@
 
 void UnityMenuModel::setBusName(const QByteArray &name)
 {
-    priv->clearName();
-
-    if (priv->nameWatchId)
-        g_bus_unwatch_name (priv->nameWatchId);
-
-    priv->nameWatchId = g_bus_watch_name (G_BUS_TYPE_SESSION, name.constData(), G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-                                          UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished,
-                                          priv, NULL);
-    priv->busName = name;
+    if (name != priv->busName) {
+        priv->clearName();
+
+        if (priv->nameWatchId) {
+            g_bus_unwatch_name (priv->nameWatchId);
+            priv->nameWatchId = 0;
+        }
+
+        if (!name.isEmpty()) {
+            priv->nameWatchId = g_bus_watch_name (G_BUS_TYPE_SESSION, name.constData(), G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+                                                  UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished,
+                                                  priv, NULL);
+        }
+
+        priv->busName = name;
+        Q_EMIT busNameChanged(priv->busName);
+    }
 }
 
 QVariantMap UnityMenuModel::actions() const
@@ -310,8 +318,12 @@
 
 void UnityMenuModel::setActions(const QVariantMap &actions)
 {
-    priv->actions = actions;
-    priv->updateActions();
+    if (actions != priv->actions) {
+        priv->actions = actions;
+        priv->updateActions();
+
+        Q_EMIT actionsChanged(priv->actions);
+    }
 }
 
 QByteArray UnityMenuModel::menuObjectPath() const
@@ -321,8 +333,12 @@
 
 void UnityMenuModel::setMenuObjectPath(const QByteArray &path)
 {
-    priv->menuObjectPath = path;
-    priv->updateMenuModel();
+    if (path != priv->menuObjectPath) {
+        priv->menuObjectPath = path;
+        priv->updateMenuModel();
+
+        Q_EMIT menuObjectPathChanged(priv->menuObjectPath);
+    }
 }
 
 ActionStateParser* UnityMenuModel::actionStateParser() const

=== modified file 'libqmenumodel/src/unitymenumodel.h'
--- libqmenumodel/src/unitymenumodel.h	2013-09-03 10:02:47 +0000
+++ libqmenumodel/src/unitymenumodel.h	2013-11-22 13:51:15 +0000
@@ -67,7 +67,7 @@
 
 Q_SIGNALS:
     void busNameChanged(const QByteArray &name);
-    void actionsChanged(const QByteArray &path);
+    void actionsChanged(const QVariantMap &actions);
     void menuObjectPathChanged(const QByteArray &path);
     void actionStateParserChanged(ActionStateParser* parser);