diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-01-17 11:14:06 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-01-17 11:14:06 +0000 |
| commit | 3fec59fac205ff4588f8afe93b28943b31f9ab8d (patch) | |
| tree | 0687e8a4cc948efdbcf2a480beb9381a03382e85 /src/prefs_account.c | |
| parent | f0325b36e30c81266a5e6f750553be6bc6e8fe33 (diff) | |
automatically take over older config files.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@13 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/prefs_account.c')
| -rw-r--r-- | src/prefs_account.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/prefs_account.c b/src/prefs_account.c index bcad14b9..39a5f101 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2003 Hiroyuki Yamamoto + * Copyright (C) 1999-2005 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,6 +43,7 @@ #include "foldersel.h" #include "inc.h" #include "menu.h" +#include "codeconv.h" #include "gtkutils.h" #include "utils.h" #include "alertpanel.h" @@ -514,13 +515,27 @@ PrefsAccount *prefs_account_new(void) void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label) { const guchar *p = label; + gchar *rcpath; + const gchar *encoding = NULL; gint id; g_return_if_fail(ac_prefs != NULL); g_return_if_fail(label != NULL); memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount)); - prefs_read_config(param, label, ACCOUNT_RC); + + rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL); + if (!is_file_exist(rcpath)) { + debug_print("reading older version of accountrc ...\n"); + g_free(rcpath); + rcpath = g_strconcat(get_old_rc_dir(), G_DIR_SEPARATOR_S, + ACCOUNT_RC, NULL); + encoding = conv_get_locale_charset_str(); + } + + prefs_read_config(param, label, rcpath, encoding); + g_free(rcpath); + *ac_prefs = tmp_ac_prefs; while (*p && !isdigit(*p)) p++; id = atoi(p); |