aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-05-09 22:41:31 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-05-09 22:41:31 +0800
commit3ee0a4c49eff58eabeb0aa25362c533e3e88d09e (patch)
treea29e9e981601fe24e7f82e7589622578a37df37d
parentc65e10b1513920673533b021b05806fb16950429 (diff)
downloadgsoc2013-evolution-3ee0a4c49eff58eabeb0aa25362c533e3e88d09e.tar.gz
gsoc2013-evolution-3ee0a4c49eff58eabeb0aa25362c533e3e88d09e.tar.zst
gsoc2013-evolution-3ee0a4c49eff58eabeb0aa25362c533e3e88d09e.zip
Fix misplaced `g_free()' that resulted in garbage to be printed out
in the case of an initialization failure. svn path=/trunk/; revision=2941
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5d897bd62b..c479f46f5b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-09 Ettore Perazzoli <ettore@helixcode.com>
+
+ * e-shell.c (setup_storages): Woops. Don't free the path before
+ the warning message, as we need to print it.
+
2000-05-08 Ettore Perazzoli <ettore@helixcode.com>
* main.c (destroy_cb): New function.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index f69606ab18..1223fc3e33 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -77,13 +77,15 @@ setup_storages (EShell *shell)
local_storage_path = g_concat_dir_and_file (priv->local_directory,
LOCAL_STORAGE_DIRECTORY);
local_storage = e_local_storage_open (local_storage_path);
- g_free (local_storage_path);
if (local_storage == NULL) {
g_warning (_("Cannot set up local storage -- %s"), local_storage_path);
+ g_free (local_storage_path);
return FALSE;
}
+ g_free (local_storage_path);
+
priv->storage_set = e_storage_set_new ();
e_storage_set_add_storage (priv->storage_set, local_storage);