Merge lp://qastaging/~3v1n0/libdbusmenu/really-recreate-menu into lp://qastaging/libdbusmenu/14.10
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 472 |
Merged at revision: | 472 |
Proposed branch: | lp://qastaging/~3v1n0/libdbusmenu/really-recreate-menu |
Merge into: | lp://qastaging/libdbusmenu/14.10 |
Diff against target: |
11 lines (+1/-0) 1 file modified
libdbusmenu-gtk/parser.c (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~3v1n0/libdbusmenu/really-recreate-menu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+222419@code.qastaging.launchpad.net |
Commit message
Parser: make sure that the old dbus menuitem is detached from the widget before recreating
When a dbus menuitem has to be recreated, we need to disconnect the widget from it, or
the old one will be reused at next parsing cycle.
Description of the change
Although libdbusmenu was supposed to recreate menus when a label was initially set, it actually was not doing that since we were not resetting the old menuitem, and then we were reusing it instead of creating a new one.
Test case: http://
To post a comment you must log in.
PASSED: Continuous integration, rev:472 jenkins. qa.ubuntu. com/job/ libdbusmenu- ci/23/ jenkins. qa.ubuntu. com/job/ libdbusmenu- utopic- amd64-ci/ 1 jenkins. qa.ubuntu. com/job/ libdbusmenu- utopic- armhf-ci/ 1 jenkins. qa.ubuntu. com/job/ libdbusmenu- utopic- armhf-ci/ 1/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/libdbusmenu -ci/23/ rebuild
http://