lp://qastaging/~larsu/notify-osd/1520667
- Get this branch:
- bzr branch lp://qastaging/~larsu/notify-osd/1520667
Branch merges
- Sebastien Bacher: Approve
-
Diff: 48 lines (+11/-3)2 files modifiedsrc/bubble.c (+10/-2)
tests/Makefile.am (+1/-1)
Related bugs
Bug #1520667: Try to load images from the icon theme | High | Fix Released |
Related blueprints
Branch information
Recent revisions
- 503. By Lars Karlitski
-
bubble_set_icon: also allow paths in icon name field
This is against the spec, which only allows file:// uris and icon names,
but is used by many applications and was supported in earlier versions
of notify-osd. - 502. By Lars Karlitski
-
bubble_set_icon: use g_warning for errors
Using standard logging makes it easier to debug notify-osd using
G_DEBUG_MESSAGES and the like.Also, the strings were missing newlines, which made errors hard to read.
- 500. By Lars Karlitski
-
Ignore body for synchronous notifications
It doesn't make sense to not show the notification at all when a body is set. Instead, simply ignore the body.
- 498. By Lars Karlitski
-
Listen to xsettings dpi changes
We only listened to font scale factor changes on gsettings, but retrieved the actual value from xsettings (through gtk-xft-dpi). This is racy: unity-settings-
daemon also listens to gsettings and might not have set the xsettings value when our handler is run. Fix this by listening to xsettings changes as well.
This means that we're now listening for both xsettings and gsettings changes for what is essentially the same thing and recalculate size on each of them. This creates some unnecessary work, but those settings are not changed very often. We can't only listen on xsettings, because there are other gsettings keys that might trigger a change in notification bubble appearance. Fixes: #1303796
Approved by: Sebastien Bacher - 497. By Lars Karlitski
-
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/notify-osd