aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucian Langa <lucilanga@gnome.org>2010-01-09 15:38:43 +0800
committerLucian Langa <lucilanga@gnome.org>2010-01-09 15:39:22 +0800
commitd25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6 (patch)
tree7a3540bbab28db031f7bc0e8ad057330ca4c827f
parentfc94ec1dfa11127d070d80683bdc4d4cb367e5a4 (diff)
downloadgsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar.gz
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar.bz2
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar.lz
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar.xz
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.tar.zst
gsoc2013-evolution-d25df2ff25c20e6b8a0fc1d2977dbd49f6335fb6.zip
Bug 606449 - empty mail-notification popups
-rw-r--r--plugins/mail-notification/mail-notification.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 22b0eeacd1..72e3881b23 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -465,7 +465,7 @@ can_support_actions (void)
static void
new_notify_status (EMEventTargetFolder *t)
{
- gchar *msg;
+ gchar *msg, *safetext;
gboolean new_icon = !status_icon;
if (new_icon) {
@@ -540,13 +540,14 @@ new_notify_status (EMEventTargetFolder *t)
#ifdef HAVE_LIBNOTIFY
/* Now check whether we're supposed to send notifications */
if (is_part_enabled (GCONF_KEY_STATUS_NOTIFICATION)) {
+ safetext = g_markup_escape_text(msg, strlen(msg));
if (notify) {
- notify_notification_update (notify, _("New email"), msg, "mail-unread");
+ notify_notification_update (notify, _("New email"), safetext, "mail-unread");
} else {
if (!notify_init ("evolution-mail-notification"))
fprintf (stderr,"notify init error");
- notify = notify_notification_new (_("New email"), msg, "mail-unread", NULL);
+ notify = notify_notification_new (_("New email"), safetext, "mail-unread", NULL);
notify_notification_attach_to_status_icon (notify, status_icon);
/* Check if actions are supported */
@@ -557,6 +558,7 @@ new_notify_status (EMEventTargetFolder *t)
g_timeout_add (500, notification_callback, notify);
}
}
+ g_free(safetext);
}
#endif