Mercurial > pidgin.yaz
changeset 8839:ebbc39e0050d
[gaim-migrate @ 9605]
so hard to find my way
now that i'm all on my own
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Wed, 28 Apr 2004 03:57:42 +0000 |
| parents | 518455386538 |
| children | 01c3db200c8f |
| files | src/main.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c Wed Apr 28 03:16:40 2004 +0000 +++ b/src/main.c Wed Apr 28 03:57:42 2004 +0000 @@ -841,11 +841,6 @@ gaim_plugins_probe(NULL); - gaim_set_blist(gaim_blist_new()); - gaim_blist_load(); - - gaim_prefs_load(); - /* we only read ~/.gaimrc (load_prefs()) if there is no accounts.xml * since prefs.xml existed alongside ~/.gaim in 0.64 */ if (!gaim_accounts_load()) { @@ -853,6 +848,11 @@ gaim_prefs_sync(); } + gaim_set_blist(gaim_blist_new()); + gaim_blist_load(); + + gaim_prefs_load(); + gaim_gtk_prefs_rename_old(); /* load plugins we had when we quit */