Merge lp://qastaging/~larsu/notify-osd/spam-a-bit-less into lp://qastaging/notify-osd

Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 494
Merged at revision: 497
Proposed branch: lp://qastaging/~larsu/notify-osd/spam-a-bit-less
Merge into: lp://qastaging/notify-osd
Diff against target: 314 lines (+71/-156)
3 files modified
src/bubble.c (+69/-150)
src/bubble.h (+1/-5)
src/stack.c (+1/-1)
To merge this branch: bzr merge lp://qastaging/~larsu/notify-osd/spam-a-bit-less
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+274382@code.qastaging.launchpad.net

Commit message

Refactor bubble_set_icon()

This function did the same as bubble_set_icon_for_path(), because paths are allowed in addition to icon names for both the app-icon parameter and the image-path hint.

Remove one of those functions and inline load_icon(), which gives us more control over when icon-not-found warnings are shown. Don't show one when using the fallback of prefixing the icon name with "notification-".

Remove TEMPORARY_ICON_PREFIX_WORKAROUND. It's been there since 2009 and
was never set to anything but 1.

Description of the change

Refactor bubble_set_icon() a bit to remove warnings about not found icons when using the "notification-" fallback.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine and start of a new cycle is a good time to land such changes ;-)

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

with that branch the sound icons displayed when doing mouseover rolling over indicator-sound are wrong ...

review: Needs Fixing
494. By Lars Karlitski

bubble_set_icon: try fallback icon name first

Fallback icon name is the one prefixed with "notification-". The
previous commit accidentally changed the order of lookups.

Remove TEMPORARY_ICON_PREFIX_WORKAROUND. It's been there since 2009 and
was never set to anything but 1.

Revision history for this message
Lars Karlitski (larsu) wrote :

Indeed. Fixed in r494.

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

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