nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fail more gracefully on broken markup

Browse Source 
Strip markup and display plain text. Also print
error message why markup couldn't be parsed.
This commit is contained in:
Sascha Kruse 2013-02-22 19:38:42 +00:00
parent 0d8be7dccf
commit f12d5332a8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x.c
View File

@ -184,16 +184,20 @@ colored_layout *r_create_layout_from_notification(cairo_t *c, notification *n)
r_setup_pango_layout(cl->l, width); r_setup_pango_layout(cl->l, width);
/* markup */ /* markup */
bool success = pango_parse_markup(n->text_to_render, -1, 0, &(cl->attr), &(cl->text), NULL, NULL); GError *err = NULL;
pango_parse_markup(n->text_to_render, -1, 0, &(cl->attr), &(cl->text), NULL, &err);
if (success) { if (!err) {
pango_layout_set_text(cl->l, cl->text, -1); pango_layout_set_text(cl->l, cl->text, -1);
pango_layout_set_attributes(cl->l, cl->attr); pango_layout_set_attributes(cl->l, cl->attr);
} else { } else {
/* remove markup and display plain message instead */
n->text_to_render = notification_fix_markup(n->text_to_render);
cl->text = NULL; cl->text = NULL;
cl->attr = NULL; cl->attr = NULL;
pango_layout_set_text(cl->l, n->text_to_render, -1); pango_layout_set_text(cl->l, n->text_to_render, -1);
printf("Error parsing markup\n"); printf("Error parsing markup: %s\n", err->message);
g_error_free(err);
} }
pango_layout_get_pixel_size(cl->l, NULL, &(n->displayed_height)); pango_layout_get_pixel_size(cl->l, NULL, &(n->displayed_height));