2007-03-05 [paul] 2.8.0cvs21

	* src/plugins/pgpcore/prefs_gpg.c
		fix compiler warning

diff --git a/ChangeLog b/ChangeLog
index 0f8e48fa609a161e4f20696cadced21c3598f09d..ee15771d64733e156bee288b7652488ee9600e42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-05 [paul]      2.8.0cvs21
+
+       * src/plugins/pgpcore/prefs_gpg.c
+               fix compiler warning
+

 2007-03-05 [wwp]       2.8.0cvs20
 
        * src/matcher_parser_parse.y
 2007-03-05 [wwp]       2.8.0cvs20
 
        * src/matcher_parser_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 92277ae5a68fe92acb4a5b1a0019334a0c632f73..44d537c5a37712c51ebd96d3affb7963df5f76a5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2413,3 +2413,4 @@
 ( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/filtering.c;  ) > 2.8.0cvs18.patchset
 ( cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/prefs_filtering_action.c;  cvs diff -u -r 1.75.2.37 -r 1.75.2.38 src/matcher.c;  cvs diff -u -r 1.39.2.11 -r 1.39.2.12 src/matcher.h;  cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/filtering.c;  cvs diff -u -r 1.21.2.11 -r 1.21.2.12 src/filtering.h;  ) > 2.8.0cvs19.patchset
 ( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 src/matcher_parser_parse.y;  ) > 2.8.0cvs20.patchset
 ( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/filtering.c;  ) > 2.8.0cvs18.patchset
 ( cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/prefs_filtering_action.c;  cvs diff -u -r 1.75.2.37 -r 1.75.2.38 src/matcher.c;  cvs diff -u -r 1.39.2.11 -r 1.39.2.12 src/matcher.h;  cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/filtering.c;  cvs diff -u -r 1.21.2.11 -r 1.21.2.12 src/filtering.h;  ) > 2.8.0cvs19.patchset
 ( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 src/matcher_parser_parse.y;  ) > 2.8.0cvs20.patchset

+( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.8.0cvs21.patchset

diff --git a/configure.ac b/configure.ac
index d4df2d216f6fa4c6c802e0138121958e9110c0df..7c54c933abbeef4d67dab4ceb34c869da7f8a528 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=20
+EXTRA_VERSION=21

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index fca79dba2babe801b4b2c7a51ec43fe4488c815f..f8d0f7f2b9519ac66651ad6333e5a66cc49683b2 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -538,7 +538,7 @@ void prefs_gpg_init()
 {
        static gchar *path[3];
        gchar *rcpath;
 {
        static gchar *path[3];
        gchar *rcpath;

-       gchar *tmp = NULL;
+       const gchar *tmp = NULL;

 
        prefs_set_default(param);
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
 
        prefs_set_default(param);
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);