aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-local-storage.c3
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9afd5b1eb1..0d48a8fff7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-local-storage.c (setup_folder_as_stock): utf_name should not
+ be const as e_utf8_from_locale_string() returns an allocated
+ buffer.
+
3001-08-17 Iain Holmes <iain@ximian.com>
* Evolution.idl: Add Evolution-Wizard.idl
@@ -6,8 +12,8 @@
* Makefile.am: Add the wizard stuff and the startup dialog stuff
- * e-shell.c (e_shell_construct): Hide the splash screen and try to start
- the startup assistant.
+ * e-shell.c (e_shell_construct): Hide the splash screen and try to
+ start the startup assistant.
* glade/Makefile.am: Add the evolution-startup-wizard.glade
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 566980a175..7322c40cd5 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -47,6 +47,7 @@
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
#include "e-util/e-path.h"
#include "e-local-folder.h"
@@ -152,7 +153,7 @@ setup_folder_as_stock (ELocalStorage *local_storage,
const char *name)
{
EFolder *folder;
- const char *utf8_name;
+ char *utf8_name;
folder = e_storage_get_folder (E_STORAGE (local_storage), path);
if (folder == NULL)