Make everyone happy

This commit is contained in:
Berke Viktor 2013-03-23 22:14:28 +01:00
parent 5144fe509f
commit ed8e768c7e
1 changed files with 7 additions and 6 deletions

View File

@ -1046,17 +1046,18 @@ servlist_load (void)
int len; int len;
char *tmp; char *tmp;
ircnet *net = NULL; 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_rename (oldfile, newfile);
}
g_free (oldfile); g_free (oldfile);
g_free (newfile); g_free (newfile);
#endif
fp = hexchat_fopen_file ("servlist.conf", "r", 0); fp = hexchat_fopen_file ("servlist.conf", "r", 0);
if (!fp) if (!fp)