talons

commit 4abfb608e46cbe8a9389e6e94894a80276041b62
parent 02b500086274d52f43a703da17d09a1fcc5112f8
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 24 Sep 2008 07:08:30 +0000

2008-09-24 [colin]	3.5.0cvs126

	* src/common/utils.c
		Fix get_mail_base_dir() on windows
		(was synced from main ages ago)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
10
----------

4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-24 [colin]	3.5.0cvs126
+
+	* src/common/utils.c
+		Fix get_mail_base_dir() on windows
+		(was synced from main ages ago)
+
 2008-09-24 [colin]	3.5.0cvs125
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3537,3 +3537,4 @@
 ( cvs diff -u -r 1.654.2.3596 -r 1.654.2.3597 configure.ac;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/filtering.c;  cvs diff -u -r 1.274.2.273 -r 1.274.2.274 src/mainwindow.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_logging.c;  cvs diff -u -r 1.36.2.148 -r 1.36.2.149 src/common/utils.c;  cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/plugins/pgpcore/sgpgme.c;  diff -u /dev/null src/plugins/smime/claws.def;  ) > 3.5.0cvs123.patchset
 ( cvs diff -u -r 1.382.2.479 -r 1.382.2.480 src/compose.c;  cvs diff -u -r 1.274.2.274 -r 1.274.2.275 src/mainwindow.c;  cvs diff -u -r 1.94.2.187 -r 1.94.2.188 src/messageview.c;  ) > 3.5.0cvs124.patchset
 ( cvs diff -u -r 1.115.2.206 -r 1.115.2.207 src/main.c;  cvs diff -u -r 1.1.2.75 -r 1.1.2.76 src/wizard.c;  ) > 3.5.0cvs125.patchset
+( cvs diff -u -r 1.36.2.149 -r 1.36.2.150 src/common/utils.c;  ) > 3.5.0cvs126.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=125
+EXTRA_VERSION=126
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -1857,17 +1857,7 @@ gboolean rc_dir_is_alt(void) {
 
 const gchar *get_mail_base_dir(void)
 {
-#ifdef G_OS_WIN32
-	static gchar *mail_base_dir = NULL;
-
-	if (!mail_base_dir)
-		mail_base_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-					    "Mailboxes", NULL);
-
-	return mail_base_dir;
-#else
 	return get_home_dir();
-#endif
 }
 
 #ifdef MAEMO