[gnome-calendar] event-widget: escape event summary
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] event-widget: escape event summary
- Date: Tue, 7 Mar 2017 00:56:26 +0000 (UTC)
commit e406f93239b551b6de4d2e7d0a52989cdf16db0c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Mar 6 21:51:58 2017 -0300
event-widget: escape event summary
Now that we may set event markups, we have
to be careful to escape the event summary
and make sure that we always pass a valid
markup.
src/gcal-event-widget.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/gcal-event-widget.c b/src/gcal-event-widget.c
index e4d6309..f7e5035 100644
--- a/src/gcal-event-widget.c
+++ b/src/gcal-event-widget.c
@@ -473,6 +473,7 @@ gcal_event_widget_draw (GtkWidget *widget,
PangoLayout *layout;
PangoFontDescription *font_desc;
gchar *display_text;
+ gchar *escaped_text;
self = GCAL_EVENT_WIDGET (widget);
context = gtk_widget_get_style_context (widget);
@@ -488,12 +489,18 @@ gcal_event_widget_draw (GtkWidget *widget,
gtk_render_frame (context, cr, 0, 0, width, height);
/*
+ * Since we set markup labels, we have to escape text before
+ * using it, or we get empty event widgets.
+ */
+ escaped_text = g_markup_escape_text (gcal_event_get_summary (self->event), -1);
+
+ /*
* The text displayed in the widget includes the time when the event
* is timed, or not if the event is all day.
*/
if (gcal_event_get_all_day (self->event))
{
- display_text = g_strdup (gcal_event_get_summary (self->event));
+ display_text = escaped_text;
}
else
{
@@ -514,16 +521,17 @@ gcal_event_widget_draw (GtkWidget *widget,
if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (is_ltr)
- display_text = g_strdup_printf ("(%s) %s", start_time, gcal_event_get_summary (self->event));
+ display_text = g_strdup_printf ("(%s) %s", start_time, escaped_text);
else
- display_text = g_strdup_printf ("%s (%s)", gcal_event_get_summary (self->event), start_time);
+ display_text = g_strdup_printf ("%s (%s)", escaped_text, start_time);
}
else
{
- display_text = g_strdup_printf ("<b>%s</b>\n%s", start_time, gcal_event_get_summary (self->event));
+ display_text = g_strdup_printf ("<b>%s</b>\n%s", start_time, escaped_text);
}
g_clear_pointer (&local_start_time, g_date_time_unref);
+ g_clear_pointer (&escaped_text, g_free);
g_clear_pointer (&start_time, g_free);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]