unity-2d

Merge lp://staging/~agateau/unity-2d/show-pidgin-trayicon into lp://staging/unity-2d/3.0

  1. show-pidgin-trayicon
  2. Merge into natty
Proposed by Aurélien Gâteau
Status: Merged
Approved by: Ugo Riboni
Approved revision: 419
Merged at revision: 426
Proposed branch: lp://staging/~agateau/unity-2d/show-pidgin-trayicon
Merge into: lp://staging/unity-2d/3.0
Diff against target: 55 lines (+22/-4)
2 files modified
panel/applets/legacytray/fdoselectionmanager.cpp (+0/-1)
panel/applets/legacytray/x11embedcontainer.cpp (+22/-3)
To merge this branch: bzr merge lp://staging/~agateau/unity-2d/show-pidgin-trayicon
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
Review via email: mp+51905@code.staging.launchpad.net

Commit message

[panel] Ask Pidgin an icon of the correct size.

Description of the change

Pidgin tray icon is 16x16, which caused XGetImage to fail since it requested a 24x24 image. The comment in the code should make it somehow clear how we try to accommodate with the different situations.

To post a comment you must log in.
Revision history for this message
Ugo Riboni (uriboni) wrote :

The fix itself makes sense, and I get both the pidgin and mumble icon correctly.

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.

Subscribers

People subscribed via source and target branches