2004-11-17 [colin] 0.9.12cvs154

	* src/privacy.c
		Fix more pointer confusion

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f1a501528961cc4667230deaba79d28025b8a7e8..f8508597f5a6bc8e004d71852a77423a3628ea38 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-11-17 [colin]     0.9.12cvs154
+
+       * src/privacy.c
+               Fix more pointer confusion
+
 2004-11-17 [paul]      0.9.12cvs153
 
        * src/procmime.h

diff --git a/PATCHSETS b/PATCHSETS
index fc5134751a736f6ececd0c609bcfbdfeca52a1f3..133daf0923666e615ed97540c05e5ecc6c902e49 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -136,3 +136,4 @@
 ( cvs diff -u -r 1.10 -r 1.11 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs151.patchset
 ( cvs diff -u -r 1.446 -r 1.447 ChangeLog; cvs diff -u -r 1.441 -r 1.442 ChangeLog.jp; cvs diff -u -r 1.51 -r 1.52 NEWS; cvs diff -u -r 1.454 -r 1.455 src/compose.c; cvs diff -u -r 1.20 -r 1.21 src/jpilot.c; cvs diff -u -r 1.92 -r 1.93 src/procmime.c; ) > 0.9.12cvs152.patchset
 ( cvs diff -u -r 1.33 -r 1.34 src/procmime.h; ) > 0.9.12cvs153.patchset
+( cvs diff -u -r 1.11 -r 1.12 src/privacy.c; ) > 0.9.12cvs154.patchset

diff --git a/configure.ac b/configure.ac
index cdbb547cb4bb48f803545254939a435a38889f25..29a5fea1298918ac9dfa8ebc10d984fd9f63fd54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=153
+EXTRA_VERSION=154
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/privacy.c b/src/privacy.c
index 7220023eb70620a169c2eb2b6ee627a53ed25094..aeeb030ec1346b45c8f27aa15740719b6cf6d8bb 100644 (file)
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -322,11 +322,11 @@ gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
 
        system = privacy_get_system(id);
        if (system == NULL)
-               return FALSE;
+               return NULL;
        if (!system->can_encrypt)
-               return FALSE;
+               return NULL;
        if (system->get_encrypt_data == NULL)
-               return FALSE;
+               return NULL;
 
        return system->get_encrypt_data(recp_names);
 }