* mu-config: don't set opts->(maildir|linksdir) to NULL if it's invalid; do

checking later
This commit is contained in:
Dirk-Jan C. Binnema 2010-10-09 12:51:20 +03:00
parent 89b65df13b
commit 76815e4416
1 changed files with 11 additions and 3 deletions

View File

@ -94,8 +94,13 @@ set_group_index_defaults (MuConfigOptions *opts)
opts->maildir = mu_util_dir_expand (opts->maildir); opts->maildir = mu_util_dir_expand (opts->maildir);
else else
opts->maildir = mu_util_guess_maildir(); opts->maildir = mu_util_guess_maildir();
g_free (old); /* note, this may be an invalid dir, but we're checking for
* validity of the dir later */
if (!opts->maildir)
opts->maildir = old;
else
g_free (old);
} }
@ -142,7 +147,10 @@ set_group_find_defaults (MuConfigOptions *opts)
if (opts->linksdir) { if (opts->linksdir) {
gchar *old = opts->linksdir; gchar *old = opts->linksdir;
opts->linksdir = mu_util_dir_expand (opts->linksdir); opts->linksdir = mu_util_dir_expand (opts->linksdir);
g_free(old); if (!opts->linksdir) /* we'll check the dir later */
opts->linksdir = old;
else
g_free(old);
} }
/* FIXME: some warning when summary_len < 0? */ /* FIXME: some warning when summary_len < 0? */