commit 440055c5cce12ad76f977224af28cc4f4c7608de
parent 0744157470c8df9a804ca3a26312a6ff8063b728
Author: Colin Leroy <colin@colino.net>
Date: Sat, 13 Dec 2008 21:20:39 +0000
2008-12-13 [colin] 3.6.1cvs75
* Makefile.am
* src/Makefile.am
* src/common/ssl.c
* src/common/utils.c
* src/common/utils.h
* tools/Makefile.am
Finish previous patch
Diffstat:
9 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-13 [colin] 3.6.1cvs75
+
+ * Makefile.am
+ * src/Makefile.am
+ * src/common/ssl.c
+ * src/common/utils.c
+ * src/common/utils.h
+ * tools/Makefile.am
+ Finish previous patch
+
2008-12-13 [colin] 3.6.1cvs74
* tools/Makefile.am
diff --git a/Makefile.am b/Makefile.am
@@ -1,13 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
-if PLATFORM_WIN32
-tools =
-else
-tools = tools
-endif
-
-SUBDIRS = m4 po src $(tools) config doc manual
+SUBDIRS = m4 po src tools config doc manual
EXTRA_DIST = \
ChangeLog \
diff --git a/PATCHSETS b/PATCHSETS
@@ -3656,3 +3656,4 @@
( cvs diff -u -r 1.654.2.3718 -r 1.654.2.3719 configure.ac; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/claws.def; ) > 3.6.1cvs72.patchset
( cvs diff -u -r 1.25.2.28 -r 1.25.2.29 tools/Makefile.am; diff -u /dev/null tools/ca-certificates.crt; cvs diff -u -r 1.24.2.18 -r 1.24.2.19 src/common/Makefile.am; cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/ssl.c; ) > 3.6.1cvs73.patchset
( cvs diff -u -r 1.25.2.29 -r 1.25.2.30 tools/Makefile.am; ) > 3.6.1cvs74.patchset
+( cvs diff -u -r 1.24.2.24 -r 1.24.2.25 Makefile.am; cvs diff -u -r 1.155.2.94 -r 1.155.2.95 src/Makefile.am; cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/ssl.c; cvs diff -u -r 1.36.2.156 -r 1.36.2.157 src/common/utils.c; cvs diff -u -r 1.20.2.64 -r 1.20.2.65 src/common/utils.h; cvs diff -u -r 1.25.2.30 -r 1.25.2.31 tools/Makefile.am; ) > 3.6.1cvs75.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -7,7 +7,7 @@ etpan_dir =
etpan_library =
endif
-SUBDIRS = common gtk $(etpan_dir) . plugins
+SUBDIRS = common gtk $(etpan_dir) . plugins
bin_PROGRAMS = claws-mail
install-exec-hook:
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -120,13 +120,7 @@ const gchar *claws_ssl_get_cert_file(void)
}
return NULL;
#else
- const gchar *cert_file = NULL;
- if (cert_file == NULL)
- cert_file = g_strconcat(DATAROOTDIR,
- G_DIR_SEPARATOR_S,
- "ca-certificates.crt",
- NULL);
- return cert_file;
+ return get_cert_file();
#endif
}
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -1958,6 +1958,19 @@ const gchar *get_template_dir(void)
return template_dir;
}
+#ifdef G_OS_WIN32
+const gchar *get_cert_file(void)
+{
+ const gchar *cert_file = NULL;
+ if (!cert_file)
+ cert_file = g_strconcat(w32_get_module_dir(),
+ "\\share\\claws-mail\\",
+ "ca-certificates.crt",
+ NULL);
+ return cert_file;
+}
+#endif
+
/* Return the default directory for Plugins. */
const gchar *get_plugin_dir(void)
{
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -358,7 +358,9 @@ const gchar *get_tmp_dir (void);
const gchar *get_locale_dir (void);
gchar *get_tmp_file (void);
const gchar *get_domain_name (void);
-
+#ifdef G_OS_WIN32
+const gchar *get_cert_file(void);
+#endif
/* file / directory handling */
off_t get_file_size (const gchar *file);
off_t get_file_size_as_crlf (const gchar *file);
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -73,5 +73,6 @@ distclean-local:
if PLATFORM_WIN32
install-data-local:
- cp ca-certificates.crt ${pkgdatadir}
+ mkdir -p ${pkgdatadir}
+ cp ${top_srcdir}/tools/ca-certificates.crt ${pkgdatadir}/
endif
