2008-12-16 [colin] 3.6.1cvs79

	* src/plugins/pgpcore/sgpgme.c
		Fix warning

diff --git a/ChangeLog b/ChangeLog
index c429aae0735f70f43ea965d56bcb30ebb595f791..c3c61132d3e3ac06edb67badbff16e64c4e1e2c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-16 [colin]     3.6.1cvs79
+
+       * src/plugins/pgpcore/sgpgme.c
+               Fix warning
+
 2008-12-15 [colin]     3.6.1cvs78
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index c4e043305d29e8026015c5f90562c12e9933cbc4..91862334ff0fdd015c2f15445280afa9704d8a2e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3660,3 +3660,4 @@
 ( cvs diff -u -r 1.1.4.3 -r 1.1.4.4 m4/spamassassin.m4;  ) > 3.6.1cvs76.patchset
 ( cvs diff -u -r 1.36.2.157 -r 1.36.2.158 src/common/utils.c;  ) > 3.6.1cvs77.patchset
 ( cvs diff -u -r 1.382.2.489 -r 1.382.2.490 src/compose.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/privacy.c;  cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/privacy.h;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/sgpgme.h;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/smime.c;  ) > 3.6.1cvs78.patchset
+( cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs79.patchset

diff --git a/configure.ac b/configure.ac
index 8f8085930d3fb2f9d1bc31d03f5b1ebf04bc3d97..2d7daa1c5bcbfa4f64c84a72cd860e26f47f231b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=78
+EXTRA_VERSION=79
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 2ba23ba45c1c3fe11f4948ee3769298e29a99f9e..c55eebf5c4b7f047bbaa0aa0e541ae5334ba9161 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -495,7 +495,7 @@ gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account,
        }
 
        if (config->sign_key != SIGN_KEY_DEFAULT) {
-               gchar *keyid;
+               const gchar *keyid;
                gpgme_key_t key, key2;
                gpgme_error_t err;