comparison src/main.c @ 5909:1a7f7feab916

[gaim-migrate @ 6341] read .gaimrc if there's no accounts.xml committer: Tailor Script <[e-mail]>

5908:ed8a9a3bf7e2

	g_free(plugin_search_paths[2]);

	gaim_plugins_probe(NULL);

	if (!gaim_prefs_load()) {
		load_prefs();
		gaim_prefs_sync();
	}

	/* load plugins we had when we quit */
	gaim_plugins_load_saved();

	gaim_accounts_load();
	gaim_pounces_load();

#ifdef _WIN32
	/* Various win32 initializations */
	wgaim_init();

5909:1a7f7feab916

	g_free(plugin_search_paths[2]);

	gaim_plugins_probe(NULL);

	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();
	}

	/* load plugins we had when we quit */
	gaim_plugins_load_saved();

	gaim_pounces_load();

#ifdef _WIN32
	/* Various win32 initializations */
	wgaim_init();