remove purple_user_dir which has been deprecated

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1757/

4 files changed, 3 insertions, 35 deletions

diff --git a/ChangeLog.API b/ChangeLog.API
index 0e781f9aee..bfa7aada34 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -707,6 +707,7 @@ version 3.0.0 (??/??/????):
 		* PurpleType, use GType instead.
 		* purple_unescape_filename
 		* purple_url_decode
+		* purple_user_dir
 		* purple_utf8_salvage.  Use g_utf8_make_valid instead.
 		* purple_utf8_strftime
 		* purple_util_write_data_to_file_absolute.  Use g_file_set_contents
@@ -772,9 +773,6 @@ version 3.0.0 (??/??/????):
 		* xmlnode_set_attrib_with_namespace
 		* xmlnode_set_attrib_with_prefix
 
-		Deprecated:
-		* purple_user_dir
-
 	Pidgin:
 		Added:
 		* pidgin_create_webview
diff --git a/finch/gntui.c b/finch/gntui.c
index 71b845e30f..32f2a6fc15 100644
--- a/finch/gntui.c
+++ b/finch/gntui.c
@@ -82,7 +82,7 @@ void finch_ui_init()
 
 #ifdef STANDALONE
 #ifdef _WIN32 /* TODO: don't change it when using FHS under win32 */
-	gnt_set_config_dir(purple_user_dir());
+	gnt_set_config_dir(purple_config_dir());
 #endif /* _WIN32 */
 
 	gnt_init();
diff --git a/libpurple/purplepath.c b/libpurple/purplepath.c
index d87db6d5a3..7054146307 100644
--- a/libpurple/purplepath.c
+++ b/libpurple/purplepath.c
@@ -61,18 +61,6 @@ purple_home_dir(void) {
 #endif
 }
 
-/* Returns the argument passed to -c IFF it was present, or ~/.purple. */
-const gchar *
-purple_user_dir(void) {
-	if(custom_user_dir != NULL) {
-		return custom_user_dir;
-	} else if(!user_dir) {
-		user_dir = g_build_filename(purple_home_dir(), ".purple", NULL);
-	}
-
-	return user_dir;
-}
-
 const gchar *
 purple_cache_dir(void) {
 	return purple_xdg_dir(&cache_dir, g_get_user_cache_dir(), "cache");
diff --git a/libpurple/purplepath.h b/libpurple/purplepath.h
index fab053c3cd..6818a1699e 100644
--- a/libpurple/purplepath.h
+++ b/libpurple/purplepath.h
@@ -30,31 +30,13 @@ G_BEGIN_DECLS
 /**
  * purple_home_dir:
  *
- * Returns the user's home directory.
- *
- *  See purple_user_dir()
+ * Gets the user's home directory.
  *
  * Returns: The user's home directory.
  */
 const gchar *purple_home_dir(void);
 
 /**
- * purple_user_dir:
- *
- * Returns the purple settings directory in the user's home directory.
- * This is usually $HOME/.purple
- *
- *  See purple_home_dir()
- *
- * Returns: The purple settings directory.
- *
- * Deprecated: Use purple_cache_dir(), purple_config_dir() or
- *             purple_data_dir() instead.
- */
-G_DEPRECATED_FOR(purple_cache_dir or purple_config_dir or purple_data_dir)
-const gchar *purple_user_dir(void);
-
-/**
  * purple_cache_dir:
  *
  * Returns the purple cache directory according to XDG Base Directory Specification.