Mercurial > pidgin.yaz
comparison src/main.c @ 5909:1a7f7feab916
[gaim-migrate @ 6341]
read .gaimrc if there's no accounts.xml
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 16 Jun 2003 23:03:40 +0000 |
parents | 390d32a6b130 |
children | a4f2aba0848d |
comparison
equal
deleted
inserted
replaced
5908:ed8a9a3bf7e2 | 5909:1a7f7feab916 |
---|---|
872 | 872 |
873 g_free(plugin_search_paths[2]); | 873 g_free(plugin_search_paths[2]); |
874 | 874 |
875 gaim_plugins_probe(NULL); | 875 gaim_plugins_probe(NULL); |
876 | 876 |
877 if (!gaim_prefs_load()) { | 877 gaim_prefs_load(); |
878 | |
879 | |
880 /* we only read ~/.gaimrc (load_prefs()) if there is no accounts.xml | |
881 * since prefs.xml existed alongside ~/.gaim in 0.64 */ | |
882 if (!gaim_accounts_load()) { | |
878 load_prefs(); | 883 load_prefs(); |
879 gaim_prefs_sync(); | 884 gaim_prefs_sync(); |
880 } | 885 } |
881 | 886 |
882 /* load plugins we had when we quit */ | 887 /* load plugins we had when we quit */ |
883 gaim_plugins_load_saved(); | 888 gaim_plugins_load_saved(); |
884 | 889 |
885 gaim_accounts_load(); | |
886 gaim_pounces_load(); | 890 gaim_pounces_load(); |
887 | 891 |
888 #ifdef _WIN32 | 892 #ifdef _WIN32 |
889 /* Various win32 initializations */ | 893 /* Various win32 initializations */ |
890 wgaim_init(); | 894 wgaim_init(); |