Merge lp:~khurshid-alam/notify-osd/fix-gnotification-icon into lp:notify-osd

Proposed by Khurshid Alam
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 509
Merged at revision: 509
Proposed branch: lp:~khurshid-alam/notify-osd/fix-gnotification-icon
Merge into: lp:notify-osd
Diff against target: 18 lines (+8/-0)
1 file modified
src/stack.c (+8/-0)
To merge this branch: bzr merge lp:~khurshid-alam/notify-osd/fix-gnotification-icon
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+376177@code.launchpad.net

This proposal supersedes a proposal from 2019-08-20.

Commit message

Support 'image-path' as hint

Both freedesktop notification (https://developer.gnome.org/notification-spec/) spec & Gnotification use image-path as hint where notify-osd only uses image_path.

As a result when one uses themed icon with Gnotification it doesn't show the icon. Support for themed icon landed in https://github.com/GNOME/glib/commit/ec1edef3

Fixes LP: #1840741

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

Looks fine to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/stack.c'
--- src/stack.c 2016-04-15 02:08:31 +0000
+++ src/stack.c 2019-11-29 11:32:20 +0000
@@ -760,6 +760,14 @@
760 else760 else
761 g_warning ("image_path hint is not a string\n");761 g_warning ("image_path hint is not a string\n");
762 }762 }
763 else if ((data = (GValue*) g_hash_table_lookup (hints, "image-path")))
764 {
765 g_debug("Using image-path hint\n");
766 if ((data && G_VALUE_HOLDS_STRING (data)))
767 bubble_set_icon (bubble, g_value_get_string(data));
768 else
769 g_warning ("image-path hint is not a string\n");
770 }
763 else if (icon && *icon != '\0')771 else if (icon && *icon != '\0')
764 {772 {
765 g_debug("Using icon parameter\n");773 g_debug("Using icon parameter\n");

Subscribers

People subscribed via source and target branches