Mercurial > pidgin.yaz

changeset 5909:1a7f7feab916

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 ed8a9a3bf7e2
children 211760926728
files src/main.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c	Mon Jun 16 22:55:45 2003 +0000
+++ b/src/main.c	Mon Jun 16 23:03:40 2003 +0000
@@ -874,7 +874,12 @@
 
 	gaim_plugins_probe(NULL);
 
-	if (!gaim_prefs_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()) {
 		load_prefs();
 		gaim_prefs_sync();
 	}
@@ -882,7 +887,6 @@
 	/* load plugins we had when we quit */
 	gaim_plugins_load_saved();
 
-	gaim_accounts_load();
 	gaim_pounces_load();
 
 #ifdef _WIN32