qmenumodel

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

  1. lp1199423
  2. Merge into trunk
Proposed by Michal Hruby
Status: Work in progress
Proposed branch: lp://staging/~nick-dedekind/qmenumodel/lp1199423
Merge into: lp://staging/qmenumodel
Diff against target: 78 lines (+30/-14)
2 files modified
libqmenumodel/src/unitymenumodel.cpp (+29/-13)
libqmenumodel/src/unitymenumodel.h (+1/-1)
To merge this branch: bzr merge lp://staging/~nick-dedekind/qmenumodel/lp1199423
Reviewer Review Type Date Requested Status
Pete Woods (community) Needs Information
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+196284@code.staging.launchpad.net

This proposal supersedes a proposal from 2013-11-19.

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

Getting this message when qml initialising busName=""

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

Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> 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.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote : Posted in a previous version of this proposal

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
Revision history for this message
Pete Woods (pete-woods) wrote :

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
Reply
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> 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.

Reply
Revision history for this message
Pete Woods (pete-woods) wrote :

> > 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?

Reply
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> > > 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.

Reply
Revision history for this message
Pete Woods (pete-woods) wrote :

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

Reply
Revision history for this message
Albert Astals Cid (aacid) wrote :

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

Reply

Unmerged revisions

97. By Nick Dedekind

Better management of busName & parameter changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches