talons

commit c0b651319faa43bb8a7179c1f98032350aab7c24
parent 0c0b1cd6aef8af14fa964a7f00e4ca4dae5d260f
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 16 Dec 2008 06:31:01 +0000

2008-12-16 [colin]	3.6.1cvs79

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/sgpgme.c
 | 
2
+-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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;