Xfce Wiki

Sub domains
 
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2017-08-14 23:18:00 +0200
committerSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2017-08-14 23:20:18 +0200
commit8265b411339a390768f2c94f2bc2e0f9983da04b (patch)
tree53cf9c4909b6e363923453d59b1612cbd424ef9a
parent8a14f97928a378ef2f495747be8e9feebf23aca0 (diff)
downloadxfce4-notifyd-8265b411339a390768f2c94f2bc2e0f9983da04b.tar.gz
Fix empty body when markup is invalid Bug #10027
This patch was borrowed from Gnome's notification daemon: https://github.com/GNOME/notification-daemon/commit/620c53fc9cec4ac4ed79754c71429be9db4a7a77
-rw-r--r--xfce4-notifyd/xfce-notify-window.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
index 7671f3d..f46577e 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -728,7 +728,15 @@ xfce_notify_window_set_body(XfceNotifyWindow *window,
g_return_if_fail(XFCE_IS_NOTIFY_WINDOW(window));
if(body && *body) {
- gtk_label_set_markup(GTK_LABEL(window->body), body);
+ if (pango_parse_markup (body, -1, 0, NULL, NULL, NULL, NULL)) {
+ gtk_label_set_markup (GTK_LABEL (window->body), body);
+ } else {
+ gchar *tmp;
+
+ tmp = g_markup_escape_text (body, -1);
+ gtk_label_set_text (GTK_LABEL (window->body), body);
+ g_free (tmp);
+ }
gtk_widget_show(window->body);
window->has_body_text = TRUE;