aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-09-10 04:18:01 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-09-10 04:18:01 +0800
commit9da5b632dc8592ca953b86bd415002ab05f9f1b8 (patch)
treeffde1bb39f74d02cbd3076d28fe9422086d60bf1
parent5d4acb77ef7a1f2de8fc0cc757a3355df1aa3a88 (diff)
downloadgsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar.gz
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar.bz2
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar.lz
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar.xz
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.tar.zst
gsoc2013-evolution-9da5b632dc8592ca953b86bd415002ab05f9f1b8.zip
Fix a possible crash when viewing no folder.
svn path=/trunk/; revision=5292
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-view.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b1f41c28b0..3c55f85063 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-09 Ettore Perazzoli <ettore@helixcode.com>
+
+ * e-shell-view.c (update_for_current_uri): Make sure `folder_name'
+ is always dynamically allocated, as we `g_free()' it.
+
2000-09-08 Lauris Kaplinski <lauris@helixcode.com>
* e-shell-view.c (update_for_current_uri): Translate UTF-8 string
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 3480f01c4b..78c2a03f52 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -934,7 +934,7 @@ update_for_current_uri (EShellView *shell_view)
path);
if (folder == NULL)
- folder_name = _("None");
+ folder_name = g_strdup (_("None"));
else
folder_name = e_utf8_to_gtk_string ((GtkWidget *) shell_view, e_folder_get_name (folder));