diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-01-18 10:50:43 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-01-18 10:50:43 +0000 |
| commit | 295bd43a38d1b785183ba1599e78fa6fbbcd8e02 (patch) | |
| tree | 1e872659029f80928f3f98b4352aae8888a6928d /src/prefs_account.c | |
| parent | 3fec59fac205ff4588f8afe93b28943b31f9ab8d (diff) | |
implemented the migration of configuration.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@14 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/prefs_account.c')
| -rw-r--r-- | src/prefs_account.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/prefs_account.c b/src/prefs_account.c index 39a5f101..46673b04 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -43,7 +43,6 @@ #include "foldersel.h" #include "inc.h" #include "menu.h" -#include "codeconv.h" #include "gtkutils.h" #include "utils.h" #include "alertpanel.h" @@ -516,7 +515,6 @@ 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); @@ -525,15 +523,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label) memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount)); 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); + prefs_read_config(param, label, rcpath, NULL); g_free(rcpath); *ac_prefs = tmp_ac_prefs; |