diff options
author | Tor Lillqvist <tml@novell.com> | 2006-01-31 02:44:23 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2006-01-31 02:44:23 +0800 |
commit | 6ef5fe427fdd7e1ca4f4ae1d2604b044bd3c59dd (patch) | |
tree | 4bab60d88408015f2b657795bdd67f25caeb7bbc | |
parent | 8ff88efc7d56618fbf253a3c777ee52f45c188ae (diff) | |
download | gsoc2013-evolution-6ef5fe427fdd7e1ca4f4ae1d2604b044bd3c59dd.tar.gz gsoc2013-evolution-6ef5fe427fdd7e1ca4f4ae1d2604b044bd3c59dd.tar.zst gsoc2013-evolution-6ef5fe427fdd7e1ca4f4ae1d2604b044bd3c59dd.zip |
On Win32, don't bother to attempt looking in Unix paths like /usr/lib or
2006-01-30 Tor Lillqvist <tml@novell.com>
* lib/e-cert-db.c (install_loadable_roots): On Win32, don't bother
to attempt looking in Unix paths like /usr/lib or /opt/mozilla
for Mozilla's nssckbi module. If necessary, add code later to look
up the installation path of Mozilla or Firefox from the Registry.
svn path=/trunk/; revision=31382
-rw-r--r-- | smime/ChangeLog | 7 | ||||
-rw-r--r-- | smime/lib/e-cert-db.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index 1225cc3ed3..a501fcd8c7 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,10 @@ +2006-01-30 Tor Lillqvist <tml@novell.com> + + * lib/e-cert-db.c (install_loadable_roots): On Win32, don't bother + to attempt looking in Unix paths like /usr/lib or /opt/mozilla + for Mozilla's nssckbi module. If necessary, add code later to look + up the installation path of Mozilla or Firefox from the Registry. + 2006-01-29 Kjartan Maraas <kmaraas@gnome.org> * gui/cert-trust-dialog.c: (ctd_response): diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index ea8e76ab36..de310ab4be 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -267,6 +267,7 @@ install_loadable_roots (void) } if (!RootsModule) { +#ifndef G_OS_WIN32 /* grovel in various places for mozilla's built-in cert module. @@ -298,6 +299,12 @@ install_loadable_roots (void) g_free (dll_path); } +#else + /* FIXME: Might be useful to look up if there is a + * Mozilla installation on the machine and use the + * nssckbi.dll from there. + */ +#endif } } |