Merge lp://qastaging/~attente/libindicator/1293548-1 into lp://qastaging/libindicator/14.04

Proposed by William Hua
Status: Merged
Approved by: Lars Karlitski
Approved revision: 528
Merged at revision: 528
Proposed branch: lp://qastaging/~attente/libindicator/1293548-1
Merge into: lp://qastaging/libindicator/14.04
Diff against target: 12 lines (+1/-1)
1 file modified
libindicator/indicator-image-helper.c (+1/-1)
To merge this branch: bzr merge lp://qastaging/~attente/libindicator/1293548-1
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+213357@code.qastaging.launchpad.net

Commit message

Don't load using the icon info structure if it's a GBytesIcon.

Description of the change

Don't load using the icon info structure if it's a GBytesIcon.

For whatever reason, GTK+ isn't able to properly render the GtkIconInfo structure that's derived from an icon theme lookup of a GBytesIcon. So we should prevent this specific case from being rendered using its GtkIconInfo if the icon is a GBytesIcon.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Looking up a bytes icon should work. At least gtk_icon_theme_lookup_by_gicon() handles GLoadableIcon (which is implemented by GBytesIcon).

Also, wouldn't it make more sense if we didn't call this function at all in the case of a bytes icon?

Anyway, I hear this should go into the LTS and the code around has a lot of other problems. I'm fine with approving this as a hack right now.

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