2006-01-03 [colin] 1.9.100cvs121

	* src/common/prefs.c
		Windows unlink-before rename fix
	* src/plugins/pgpcore/sgpgme.c
		Add support for PKA info if available
		Both patches by Werner Koch

diff --git a/ChangeLog b/ChangeLog
index 0b8734c50229394d0c073d3fec920ec76214fbff..d2179ba2cec003dd6489de1bc35f9284f6f5b205 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-03 [colin]     1.9.100cvs121
+
+       * src/common/prefs.c
+               Windows unlink-before rename fix
+       * src/plugins/pgpcore/sgpgme.c
+               Add support for PKA info if available
+               Both patches by Werner Koch
+

 2006-01-03 [paul]      1.9.100cvs120
 
        * src/messageview.c
 2006-01-03 [paul]      1.9.100cvs120
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2bf513d54b34ac8695ac413cc789d8a5d7e3568e..b18f7cbd488b44100553de9370bf23449cd07e4a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1104,3 +1104,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/keyboard.xml;  ) > 1.9.100cvs118.patchset
 ( cvs diff -u -r 1.382.2.212 -r 1.382.2.213 src/compose.c;  cvs diff -u -r 1.179.2.87 -r 1.179.2.88 src/imap.c;  ) > 1.9.100cvs119.patchset
 ( cvs diff -u -r 1.94.2.71 -r 1.94.2.72 src/messageview.c;  ) > 1.9.100cvs120.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/keyboard.xml;  ) > 1.9.100cvs118.patchset
 ( cvs diff -u -r 1.382.2.212 -r 1.382.2.213 src/compose.c;  cvs diff -u -r 1.179.2.87 -r 1.179.2.88 src/imap.c;  ) > 1.9.100cvs119.patchset
 ( cvs diff -u -r 1.94.2.71 -r 1.94.2.72 src/messageview.c;  ) > 1.9.100cvs120.patchset

+( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/common/prefs.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.100cvs121.patchset

diff --git a/configure.ac b/configure.ac
index 839e3f1080d2876c17e75eacd9875fbe8c402091..e1cebd4688038ef8bf0bb4c2097aa026ba13dba5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=120
+EXTRA_VERSION=121

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -627,6 +627,9 @@ if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                      [ac_cv_enable_pgpcore_plugin=no])
        if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                PLUGINS="pgpcore $PLUGINS"
                      [ac_cv_enable_pgpcore_plugin=no])
        if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                PLUGINS="pgpcore $PLUGINS"

+                AM_PATH_GPGME(1.1.1,
+                              AC_DEFINE(HAVE_GPGME_PKA_TRUST, 1,
+                                        [Define if GPGME supports PKA.]))

        else
                AC_MSG_WARN([*** PGP/CORE plugin will not be built ***])
        fi
        else
                AC_MSG_WARN([*** PGP/CORE plugin will not be built ***])
        fi

diff --git a/src/common/prefs.c b/src/common/prefs.c
index 29b94c9c10fc622c1ec841c34d606c8a34b1df1f..7088889c0424b21a05fe34e1b2e421eeed7ff7f3 100644 (file)
--- a/src/common/prefs.c
+++ b/src/common/prefs.c
@@ -172,6 +172,9 @@ gint prefs_file_close(PrefFile *pfile)
 
        if (is_file_exist(path)) {
                bakpath = g_strconcat(path, ".bak", NULL);
 
        if (is_file_exist(path)) {
                bakpath = g_strconcat(path, ".bak", NULL);

+#ifdef G_OS_WIN32
+                g_unlink(bakpath);
+#endif

                if (rename(path, bakpath) < 0) {
                        FILE_OP_ERROR(path, "rename");
                        g_unlink(tmppath);
                if (rename(path, bakpath) < 0) {
                        FILE_OP_ERROR(path, "rename");
                        g_unlink(tmppath);


@@ -182,6 +185,9 @@ gint prefs_file_close(PrefFile *pfile)
                }
        }
 
                }
        }
 

+#ifdef G_OS_WIN32
+        g_unlink(path);
+#endif

        if (rename(tmppath, path) < 0) {
                FILE_OP_ERROR(tmppath, "rename");
                g_unlink(tmppath);
        if (rename(tmppath, path) < 0) {
                FILE_OP_ERROR(tmppath, "rename");
                g_unlink(tmppath);

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 8f243b147d85b40afc6ea1c681004b5576e93bb7..d0b85146bbad892213a26d782ad5edb3bc954aa9 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -282,8 +282,23 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                        g_string_append_printf(siginfo,
                                _("Primary key fingerprint: %s\n"), 
                                sig ? sig->fpr: "?");
                        g_string_append_printf(siginfo,
                                _("Primary key fingerprint: %s\n"), 
                                sig ? sig->fpr: "?");

+#ifdef HAVE_GPGME_PKA_TRUST
+                        if (sig->pka_trust == 1 && sig->pka_address) {
+                                g_string_append_printf(siginfo,
+                                   _("WARNING: Signer's address \"%s\" "
+                                      "does not match DNS entry\n"), 
+                                   sig->pka_address);
+                        }
+                        else if (sig->pka_trust == 2 && sig->pka_address) {
+                                g_string_append_printf(siginfo,
+                                   _("Verified signer's address is \"%s\"\n"),
+                                   sig->pka_address);
+                                /* FIXME: Compare the address to the
+                                 * From: address.  */
+                        }
+#endif /*HAVE_GPGME_PKA_TRUST*/

                }
                }

-               
+

                g_string_append(siginfo, "\n");
                i++;
                sig = sig->next;
                g_string_append(siginfo, "\n");
                i++;
                sig = sig->next;