# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177347954 0
# Node ID 6a9ae99e7050ddaf7219e705f4234a9781722f4a
# Parent  b75f27a09a927249698fecfbe989084f68971b6a
Use ~/.purple only, never ~/.gaim.  This is a revert of the functional
changes from revision a4f4b823686066b90a13a21feeb2d0d04091e9b5.  I kept
the comment introduced there, but updated it.

diff -r b75f27a09a92 -r 6a9ae99e7050 libpurple/util.c
--- a/libpurple/util.c	Mon Apr 23 17:00:08 2007 +0000
+++ b/libpurple/util.c	Mon Apr 23 17:05:54 2007 +0000
@@ -2245,25 +2245,17 @@
 #endif
 }
 
-/* Returns the argument passed to -c IFF it was present, or ~/.gaim IFF it
- * exists, else ~/.purple. */
+/* Returns the argument passed to -c IFF it was present, or ~/.purple. */
 const char *
 purple_user_dir(void)
 {
-	if (custom_home_dir != NULL && strlen(custom_home_dir) > 0) {
+	if (custom_home_dir != NULL && *custom_home_dir) {
 		strcpy ((char*) &home_dir, (char*) &custom_home_dir);
 	} else {
 		const gchar *hd = purple_home_dir();
 
 		if (hd) {
 			g_strlcpy((char*) &home_dir, hd, sizeof(home_dir));
-			g_strlcat((char*) &home_dir, G_DIR_SEPARATOR_S ".gaim",
-					sizeof(home_dir));
-
-			if (g_file_test(home_dir, G_FILE_TEST_EXISTS))
-				return home_dir;
-
-			g_strlcpy((char*) &home_dir, hd, sizeof(home_dir));
 			g_strlcat((char*) &home_dir, G_DIR_SEPARATOR_S ".purple",
 					sizeof(home_dir));
 		}