Merge lp:~3v1n0/libdbusmenu/custom-stock-item-label into lp:libdbusmenu/15.04
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | 477 |
Merged at revision: | 476 |
Proposed branch: | lp:~3v1n0/libdbusmenu/custom-stock-item-label |
Merge into: | lp:libdbusmenu/15.04 |
Prerequisite: | lp:~laney/libdbusmenu/libtool-and-gi |
Diff against target: |
95 lines (+15/-11) 4 files modified
INSTALL (+12/-7) libdbusmenu-gtk/parser.c (+1/-1) tests/Makefile.am (+1/-1) tests/test-json-server.c (+1/-2) |
To merge this branch: | bzr merge lp:~3v1n0/libdbusmenu/custom-stock-item-label |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Lars Karlitski | Pending | ||
Review via email: mp+255709@code.launchpad.net |
This proposal supersedes a proposal from 2015-03-04.
Commit message
Parser: don't override the label for stock items if a custom one is provided
Description of the change
Parser: don't override the label for stock items if a custom one is provided
To post a comment you must log in.
FAILED: Continuous integration, rev:474 jenkins. qa.ubuntu. com/job/ libdbusmenu- ci/26/ jenkins. qa.ubuntu. com/job/ libdbusmenu- vivid-amd64- ci/1/console jenkins. qa.ubuntu. com/job/ libdbusmenu- vivid-armhf- ci/1/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/libdbusmenu -ci/26/ rebuild
http://