Merge lp://staging/~jbicha/indicator-session/lp1600502-fix-icon-install into lp://staging/indicator-session

Proposed by Jeremy Bícha
Status: Merged
Approved by: Michael Terry
Approved revision: 472
Merged at revision: 497
Proposed branch: lp://staging/~jbicha/indicator-session/lp1600502-fix-icon-install
Merge into: lp://staging/indicator-session
Diff against target: 48 lines (+15/-21)
2 files modified
data/CMakeLists.txt (+1/-21)
data/icons/CMakeLists.txt (+14/-0)
To merge this branch: bzr merge lp://staging/~jbicha/indicator-session/lp1600502-fix-icon-install
Reviewer Review Type Date Requested Status
Michael Terry Approve
Review via email: mp+299625@code.staging.launchpad.net

Commit message

Fix icon installation.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Tested. This does fix the double install issue. Seems like you could have just changed

install (DIRECTORY icons

to

install (DIRECTORY

(or dropped all the specific directory names instead)

But this works too.

review: Approve
Revision history for this message
Michael Terry (mterry) wrote :

Thanks btw! :) Double icons suck. Was in the review-zone, didn't mean to sound brusque.

Revision history for this message
Jeremy Bícha (jbicha) wrote :

No problem. I didn't realize until your comment that the real problem was

install (DIRECTORY icons

Had I used a one-word fix, I bet this would have been reviewed sooner! :)

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