Mercurial > pidgin.yaz
diff src/main.c @ 5545:7a64114641c3
[gaim-migrate @ 5946]
I've been rewriting the prefs to move from gaimrc to prefs.xml. This will
NOT compile! I don't want to see complaints about this, as it's CVS, and
you should only be using it if you can put up with things like this. Also,
don't ask how long it'll take until it compiles again. It may be several
days. This is a big migration. Even when it works, it may not run right.
However, it's made a lot of progress, and I plan to actively work on it
today and tomorrow.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Thu, 29 May 2003 19:10:24 +0000 |
parents | 933739f789f9 |
children | 7e4de9699da9 |
line wrap: on
line diff
--- a/src/main.c Thu May 29 17:35:28 2003 +0000 +++ b/src/main.c Thu May 29 19:10:24 2003 +0000 @@ -884,8 +884,9 @@ gaim_prefs_init(); gaim_gtk_prefs_init(); - gaim_prefs_load(); - load_prefs(); + + if (!gaim_prefs_load()) + load_prefs(); plugin_search_paths[0] = LIBDIR; plugin_search_paths[1] = gaim_user_dir();