diff options
author | Berke Viktor <bviktor@hexchat.org> | 2013-03-23 22:14:28 +0100 |
---|---|---|
committer | Berke Viktor <bviktor@hexchat.org> | 2013-03-23 22:14:28 +0100 |
commit | ed8e768c7e68253141c58b9a1a3b2b63f4129ef0 (patch) | |
tree | d04f6955ca94bc513c305255f60e158ecf6d7911 | |
parent | 5144fe509fc4c791d401269a4ff6a9d488e7b084 (diff) |
Make everyone happy
-rw-r--r-- | src/common/servlist.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/common/servlist.c b/src/common/servlist.c index e897b7c3..96fa4557 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -1046,17 +1046,18 @@ servlist_load (void) int len; char *tmp; ircnet *net = NULL; - -#ifndef G_OS_WIN32 /* simple migration we will keep for a short while */ - char *oldfile = g_build_filename(get_xdir(), "servlist_.conf", NULL); - char *newfile = g_build_filename(get_xdir(), "servlist.conf", NULL); - if (g_file_test(oldfile, G_FILE_TEST_EXISTS) && !g_file_test(newfile, G_FILE_TEST_EXISTS)) + /* simple migration we will keep for a short while */ + char *oldfile = g_build_filename (get_xdir (), "servlist_.conf", NULL); + char *newfile = g_build_filename (get_xdir (), "servlist.conf", NULL); + + if (g_file_test (oldfile, G_FILE_TEST_EXISTS) && !g_file_test (newfile, G_FILE_TEST_EXISTS)) + { g_rename (oldfile, newfile); + } g_free (oldfile); g_free (newfile); -#endif fp = hexchat_fopen_file ("servlist.conf", "r", 0); if (!fp) |