/pidgin/main: a9dfa29e3382: cross-win32: correct PURPLE_DATADIR ...

[Tomasz Wasilczyk]

Changeset: a9dfa29e3382985ffcd109f5d0157267087fc42d
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-17 02:12 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/a9dfa29e3382

Description:

cross-win32: correct PURPLE_DATADIR location, rename misleading wpurple_data_dir()

diffstat:

 config.h.mingw             |  2 +-
 configure.ac               |  2 +-
 libpurple/util.c           |  2 +-
 libpurple/win32/win32dep.c |  2 +-
 libpurple/win32/win32dep.h |  2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diffs (60 lines):

diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -408,7 +408,7 @@
 
 #define FINCH_LIBDIR wpurple_lib_dir()
 #define PIDGIN_LIBDIR wpurple_lib_dir()
-#define PURPLE_DATADIR wpurple_data_dir()
+#define PURPLE_DATADIR wpurple_install_dir()
 #define PURPLE_LIBDIR wpurple_lib_dir()
 #define PURPLE_LOCALEDIR wpurple_locale_dir()
 #define PURPLE_SYSCONFDIR wpurple_sysconf_dir()
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ AC_C_BIGENDIAN
 
 dnl Check for directories
 if test "x$is_win32" = "xyes" ; then
-	purple_datadir="wpurple_data_dir()"
+	purple_datadir="wpurple_install_dir()"
 	purple_libdir="wpurple_lib_dir()"
 	pidgin_libdir="wpurple_lib_dir()"
 	finch_libdir="wpurple_lib_dir()"
diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -2910,7 +2910,7 @@ purple_home_dir(void)
 #ifndef _WIN32
 	return g_get_home_dir();
 #else
-	return wpurple_data_dir();
+	return wpurple_home_dir();
 #endif
 }
 
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -189,7 +189,7 @@ const char *wpurple_locale_dir(void) {
 	return locale_dir;
 }
 
-const char *wpurple_data_dir(void) {
+const char *wpurple_home_dir(void) {
 
 	if (!app_data_dir) {
 		/* Set app data dir, used by purple_home_dir */
diff --git a/libpurple/win32/win32dep.h b/libpurple/win32/win32dep.h
--- a/libpurple/win32/win32dep.h
+++ b/libpurple/win32/win32dep.h
@@ -69,7 +69,7 @@ gchar *wpurple_get_special_folder(int fo
 const char *wpurple_install_dir(void);
 const char *wpurple_lib_dir(void);
 const char *wpurple_locale_dir(void);
-const char *wpurple_data_dir(void);
+const char *wpurple_home_dir(void);
 const char *wpurple_sysconf_dir(void);
 
 /* init / cleanup */