DBus Menu

Merge lp:~aacid/libdbusmenu/amp_replacement into lp:libdbusmenu/12.10

  1. amp_replacement
  2. Merge into trunk.12.10
Proposed by Albert Astals Cid
Status: Merged
Approved by: Ted Gould
Approved revision: 419
Merged at revision: 418
Proposed branch: lp:~aacid/libdbusmenu/amp_replacement
Merge into: lp:libdbusmenu/12.10
Diff against target: 12 lines (+1/-1)
1 file modified
libdbusmenu-gtk/genericmenuitem.c (+1/-1)
To merge this branch: bzr merge lp:~aacid/libdbusmenu/amp_replacement
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+108546@code.launchpad.net

Commit message

Escape the text we are using for markup

Description of the change

Escape the text we are using for markup

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Suggestions on how to add a test?

lp:~aacid/libdbusmenu/amp_replacement updated
419. By Albert Astals Cid

Use g_markup_escape_text instead of manually trying to fix the text

Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

Thanks Albert!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
2--- libdbusmenu-gtk/genericmenuitem.c 2012-04-23 19:04:47 +0000
3+++ libdbusmenu-gtk/genericmenuitem.c 2012-06-04 13:39:22 +0000
4@@ -279,7 +279,7 @@
5 gchar * local_label = NULL;
6 switch (GENERICMENUITEM(menu_item)->priv->disposition) {
7 case GENERICMENUITEM_DISPOSITION_NORMAL:
8- local_label = g_strdup(in_label);
9+ local_label = g_markup_escape_text(in_label, -1);
10 break;
11 case GENERICMENUITEM_DISPOSITION_INFORMATIONAL:
12 case GENERICMENUITEM_DISPOSITION_WARNING:

Subscribers

People subscribed via source and target branches