Merge lp:~mefrio-g/pantheon-notify/fix-986822 into lp:~tombeckmann/pantheon-notify/trunk

Proposed by Mario Guerriero
Status: Needs review
Proposed branch: lp:~mefrio-g/pantheon-notify/fix-986822
Merge into: lp:~tombeckmann/pantheon-notify/trunk
Diff against target: 13 lines (+1/-1)
1 file modified
src/notification.vala (+1/-1)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-notify/fix-986822
Reviewer Review Type Date Requested Status
Victor Martinez (community) Needs Fixing
Tom Beckmann Pending
Review via email: mp+103007@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

It would be better if you escaped the text before setting the markup. For instance:

name = Markup.escape (name, -1);
body = Markup.escape (body -1);
text.set_markup ("<span font='10' weight='bold'>" + name + "</span>\n<span font='9'>" + body + "</span>");

review: Needs Fixing

Unmerged revisions

18. By Mario Guerriero

fixed bug #986822

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/notification.vala'
2--- src/notification.vala 2012-04-21 20:01:07 +0000
3+++ src/notification.vala 2012-04-22 13:17:18 +0000
4@@ -276,8 +276,8 @@
5 }
6
7 public void set_text (string name, string body) {
8- text.text = "<span font='10' weight='bold'>"+name+"</span>\n<span font='9'>"+body+"</span>";
9 text.use_markup = true;
10+ text.set_markup ("<span font='10' weight='bold'>"+name+"</span>\n<span font='9'>"+body+"</span>");
11 }
12
13 public void close (bool fast_close=false) {

Subscribers

People subscribed via source and target branches

to all changes: