Unity

Merge lp://staging/~azzar1/unity/unity-sn into lp://staging/unity

  1. unity-sn
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4092
Proposed branch: lp://staging/~azzar1/unity/unity-sn
Merge into: lp://staging/unity
Prerequisite: lp://staging/~3v1n0/unity/launcher-filemanager-integration
Diff against target: 155 lines (+33/-3)
9 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
launcher/ApplicationLauncherIcon.cpp (+8/-0)
launcher/Launcher.cpp (+1/-1)
launcher/WindowedLauncherIcon.cpp (+5/-0)
launcher/WindowedLauncherIcon.h (+1/-0)
unity-shared/ApplicationManager.h (+1/-0)
unity-shared/BamfApplicationManager.cpp (+14/-0)
unity-shared/BamfApplicationManager.h (+1/-0)
To merge this branch: bzr merge lp://staging/~azzar1/unity/unity-sn
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+283322@code.staging.launchpad.net

Commit message

ApplicationLauncherIcon: use the starting property to show an icon when launched

Description of the change

Use new bamf starting property. It's not taking properly lp:~3v1n0/unity/launcher-filemanager-integration as a prerequisite. No sure if it's my fault.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4069
http://jenkins.qa.ubuntu.com/job/unity-ci/1396/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/46/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4070
http://jenkins.qa.ubuntu.com/job/unity-ci/1397/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/47/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4071
http://jenkins.qa.ubuntu.com/job/unity-ci/1398/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/48/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good, fix a typo in the s/visible/starting variable and add proper dependency on new bamf version (both in debian and cmakefile sides).

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

FAILED: Continuous integration, rev:4076
http://jenkins.qa.ubuntu.com/job/unity-ci/1418/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/68/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Done.

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

FAILED: Continuous integration, rev:4077
http://jenkins.qa.ubuntu.com/job/unity-ci/1421/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/71/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Everything has been addressed. Thanks.

So, let's go!

review: Approve

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.