comparison libpurple/util.c @ 16017:198983d7e546

Use ~/.gaim if it exists, else ~/.purple. If you think you can make this code more efficient, please do. It works for me, so I'm shipping it.

16016:1260354ed92d

#else
	return wpurple_data_dir();
#endif
}

/* returns a string of the form ~/.gaim, where ~ is replaced by the user's home
 * dir. Note that there is no trailing slash after .gaim. */
const char *
purple_user_dir(void)
{
	if (custom_home_dir != NULL && strlen(custom_home_dir) > 0) {
		strcpy ((char*) &home_dir, (char*) &custom_home_dir);

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

	return home_dir;

16017:198983d7e546

#else
	return wpurple_data_dir();
#endif
}

/* Returns the argument passed to -c IFF it was present, or ~/.gaim IFF it
 * exists, else ~/.purple. */
const char *
purple_user_dir(void)
{
	if (custom_home_dir != NULL && strlen(custom_home_dir) > 0) {
		strcpy ((char*) &home_dir, (char*) &custom_home_dir);

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

	return home_dir;