aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-01-08 23:29:42 +0800
committerMilan Crha <mcrha@redhat.com>2010-01-08 23:29:42 +0800
commitabaecf816e8b9f2c0afc754223c75e8634702b4c (patch)
treec88e4e571259683cfe0c2bee7d30f8676f138b02 /shell
parent79741ccd3f90c4c8aab672b508606d63c3899584 (diff)
downloadgsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar.gz
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar.bz2
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar.lz
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar.xz
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.tar.zst
gsoc2013-evolution-abaecf816e8b9f2c0afc754223c75e8634702b4c.zip
Bug #606340 - Crash on non-utf8 letter in mail folder name
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-sidebar.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 517999bad5..5701321f24 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -22,6 +22,7 @@
#include "e-shell-sidebar.h"
#include <e-util/e-binding.h>
+#include <e-util/e-unicode.h>
#include <shell/e-shell-view.h>
#define E_SHELL_SIDEBAR_GET_PRIVATE(obj) \
@@ -604,7 +605,7 @@ e_shell_sidebar_set_primary_text (EShellSidebar *shell_sidebar,
g_return_if_fail (E_IS_SHELL_SIDEBAR (shell_sidebar));
g_free (shell_sidebar->priv->primary_text);
- shell_sidebar->priv->primary_text = g_strdup (primary_text);
+ shell_sidebar->priv->primary_text = e_utf8_ensure_valid (primary_text);
gtk_widget_queue_resize (GTK_WIDGET (shell_sidebar));
g_object_notify (G_OBJECT (shell_sidebar), "primary-text");
@@ -650,7 +651,7 @@ e_shell_sidebar_set_secondary_text (EShellSidebar *shell_sidebar,
g_return_if_fail (E_IS_SHELL_SIDEBAR (shell_sidebar));
g_free (shell_sidebar->priv->secondary_text);
- shell_sidebar->priv->secondary_text = g_strdup (secondary_text);
+ shell_sidebar->priv->secondary_text = e_utf8_ensure_valid (secondary_text);
gtk_widget_queue_resize (GTK_WIDGET (shell_sidebar));
g_object_notify (G_OBJECT (shell_sidebar), "secondary-text");