im.pidgin.pidgin.2.2.2: 00903fe477eacdb4360f2b3559c560bcf82c3477

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 00903fe477eacdb4360f2b3559c560bcf82c3477
Ancestor: ac49319d53d65d7dd63cd8e66e9082aa600856d5
Author: datallah at pidgin.im
Date: 2007-10-22T23:39:12
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        ChangeLog.win32 libpurple/prefs.c

ChangeLog: 

applied changes from 0cf87050ffb15aa5ff8817bfdf57efda048cefde
             through 4e59fcb1e2baf2eb63083224381e0af9fe1331cc

-------------- next part --------------
============================================================
--- ChangeLog.win32	0e18074a75bbca6292a945b86a721e0af0afbf97
+++ ChangeLog.win32	4fcbde45e4878894cfee9ef957fe3a049f2955f7
@@ -1,3 +1,14 @@
+version 2.2.2 (??/??/????):
+	* Updated gtkspell to include a patch to share Aspell dictionaries
+	  among all the input fields to avoid excessive memory usage.
+	* Update libxml2 to 2.6.30
+	* Bonjour protocol now appears even if Bonjour for Windows isn't
+	  present (displays message indicating Bonjour for Windows must be
+	  installed if you try to log in and it isn't installed).
+	* libpurple now looks for a default prefs.xml in the COMMON_APPDATA
+	  directory (e.g. \Documents and Settings\All Users\Application Data\purple\prefs.xml)
+	  similarly to how this is done on other platforms.
+
 version 2.2.0 (09/13/2007):
 	* Updated gtkspell to 2.0.11
 	* Upgrade SILC to use the 1.1.2 toolkit
============================================================
--- libpurple/prefs.c	616d5c77c84b471c716ade5f430cf1d590326c88
+++ libpurple/prefs.c	ea1512721caf0987d1f7c6e4651955d3c6d88b5c
@@ -383,13 +383,20 @@ purple_prefs_load()
 	purple_debug_info("prefs", "Reading %s\n", filename);
 
 	if(!g_file_get_contents(filename, &contents, &length, &error)) {
-#ifndef _WIN32
+#ifdef _WIN32
+		gchar *common_appdata = wpurple_get_special_folder(CSIDL_COMMON_APPDATA);
+#endif
 		g_free(filename);
 		g_error_free(error);
 
 		error = NULL;
 
+#ifdef _WIN32
+		filename = g_build_filename(common_appdata ? common_appdata : "", "purple", "prefs.xml", NULL);
+		g_free(common_appdata);
+#else
 		filename = g_build_filename(SYSCONFDIR, "purple", "prefs.xml", NULL);
+#endif
 
 		purple_debug_info("prefs", "Reading %s\n", filename);
 
@@ -402,15 +409,6 @@ purple_prefs_load()
 
 			return FALSE;
 		}
-#else /* _WIN32 */
-		purple_debug_error("prefs", "Error reading prefs: %s\n",
-				error->message);
-		g_error_free(error);
-		g_free(filename);
-		prefs_loaded = TRUE;
-
-		return FALSE;
-#endif /* _WIN32 */
 	}
 
 	context = g_markup_parse_context_new(&prefs_parser, 0, NULL, NULL);