[Commits] [SCM] claws branch, master, updated. 3.9.2-39-gbb0daed

colin at claws-mail.org colin at claws-mail.org
Fri Jul 26 16:07:49 CEST 2013


The branch master of project "claws" (Claws Mail) has been updated
       via  bb0daedef638ea456c5c8cb54af790f061472f21 (commit)
       via  a545a0d286fe90f7298406725787d1df58e68290 (commit)
       via  7b66a4d0050e6fc4687278df07477677ed054142 (commit)
      from  2380a1eeab0d8020afbdb16d2e2deb8bcc4690c1 (commit)


- Log -----------------------------------------------------------------
commit bb0daedef638ea456c5c8cb54af790f061472f21
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jul 26 16:07:05 2013 +0200

    One more fix

diff --git a/src/plugins/pgpcore/plugin.def b/src/plugins/pgpcore/plugin.def
index 56b0e31..ddd5ada 100644
--- a/src/plugins/pgpcore/plugin.def
+++ b/src/plugins/pgpcore/plugin.def
@@ -29,3 +29,4 @@ EXPORTS
 
 	get_part_as_string
 	fp_read_noconv
+	pgp_locate_armor_header

commit a545a0d286fe90f7298406725787d1df58e68290
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jul 26 15:59:15 2013 +0200

    Finish previous fix

diff --git a/src/plugins/pgpcore/plugin.def b/src/plugins/pgpcore/plugin.def
index 8ba0462..56b0e31 100644
--- a/src/plugins/pgpcore/plugin.def
+++ b/src/plugins/pgpcore/plugin.def
@@ -26,3 +26,6 @@ EXPORTS
         prefs_gpg_get_config
 
 	cm_gpgme_data_rewind
+
+	get_part_as_string
+	fp_read_noconv
diff --git a/src/plugins/pgpinline/claws.def b/src/plugins/pgpinline/claws.def
index 75f83a6..c9f0ecd 100644
--- a/src/plugins/pgpinline/claws.def
+++ b/src/plugins/pgpinline/claws.def
@@ -22,4 +22,3 @@ procmime_scan_file
 procmime_write_mimeinfo
 procmime_get_part
 procmime_get_tmp_file_name
-fp_read_noconv
diff --git a/src/plugins/pgpinline/mypgpcore.def b/src/plugins/pgpinline/mypgpcore.def
index 1e17672..a2f5c66 100644
--- a/src/plugins/pgpinline/mypgpcore.def
+++ b/src/plugins/pgpinline/mypgpcore.def
@@ -17,3 +17,4 @@ sgpgme_verify_signature
 get_part_as_string
 pgp_locate_armor_header
 prefs_gpg_auto_check_signatures
+fp_read_noconv
diff --git a/src/plugins/smime/mypgpcore.def b/src/plugins/smime/mypgpcore.def
index 44dd8d2..eeba473 100644
--- a/src/plugins/smime/mypgpcore.def
+++ b/src/plugins/smime/mypgpcore.def
@@ -17,3 +17,4 @@ sgpgme_sigstat_info_short
 sgpgme_verify_signature
 cm_gpgme_data_rewind
 prefs_gpg_auto_check_signatures
+fp_read_noconv
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
index f439796..4657045 100644
--- a/src/plugins/smime/smime.c
+++ b/src/plugins/smime/smime.c
@@ -38,6 +38,7 @@
 #include "smime.h"
 #include <plugins/pgpcore/sgpgme.h>
 #include <plugins/pgpcore/prefs_gpg.h>
+#include <plugins/pgpcore/pgp_utils.h>
 #include <plugins/pgpcore/passphrase.h>
 
 #include "alertpanel.h"
@@ -692,37 +693,6 @@ static void smime_inhibit_encrypt_warning(gboolean inhibit)
 		prefs_gpg_remove_skip_encryption_warning(smime_system.id);
 }
 
-static gchar *fp_read_noconv(FILE *fp)
-{
-	GByteArray *array;
-	guchar buf[BUFSIZ];
-	gint n_read;
-	gchar *result = NULL;
-
-	if (!fp)
-		return NULL;
-	array = g_byte_array_new();
-
-	while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
-		if (n_read < sizeof(buf) && ferror(fp))
-			break;
-		g_byte_array_append(array, buf, n_read);
-	}
-
-	if (ferror(fp)) {
-		FILE_OP_ERROR("file stream", "fread");
-		g_byte_array_free(array, TRUE);
-		return NULL;
-	}
-
-	buf[0] = '\0';
-	g_byte_array_append(array, buf, 1);
-	result = (gchar *)array->data;
-	g_byte_array_free(array, FALSE);
-	
-	return result;
-}
-
 gboolean smime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 {
 	MimeInfo *msgcontent, *encmultipart;

commit 7b66a4d0050e6fc4687278df07477677ed054142
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jul 26 15:53:35 2013 +0200

    Fix exports

diff --git a/src/plugins/pgpcore/claws.def b/src/plugins/pgpcore/claws.def
index fe8c176..bdf393a 100644
--- a/src/plugins/pgpcore/claws.def
+++ b/src/plugins/pgpcore/claws.def
@@ -6,6 +6,9 @@ alertpanel_error
 alertpanel_full
 check_plugin_version
 claws_unlink
+conv_codeset_strdup
+conv_get_locale_charset_str_no_utf8
+codeconv_set_strict
 copy_file_part
 debug_print_real
 debug_srcname
@@ -69,6 +72,10 @@ prefs_write_open
 prefs_write_param
 privacy_get_error
 privacy_set_error
+procmime_mimeinfo_get_parameter
+procmime_decode_content
+procmime_get_tmp_file_name
+procmime_get_part
 textview_clear
 textview_create
 textview_destroy
diff --git a/src/plugins/pgpinline/claws.def b/src/plugins/pgpinline/claws.def
index c9f0ecd..75f83a6 100644
--- a/src/plugins/pgpinline/claws.def
+++ b/src/plugins/pgpinline/claws.def
@@ -22,3 +22,4 @@ procmime_scan_file
 procmime_write_mimeinfo
 procmime_get_part
 procmime_get_tmp_file_name
+fp_read_noconv
diff --git a/src/plugins/pgpinline/mypgpcore.def b/src/plugins/pgpinline/mypgpcore.def
index 5243e42..1e17672 100644
--- a/src/plugins/pgpinline/mypgpcore.def
+++ b/src/plugins/pgpinline/mypgpcore.def
@@ -14,3 +14,6 @@ sgpgme_sigstat_gpgme_to_privacy
 sgpgme_sigstat_info_full
 sgpgme_sigstat_info_short
 sgpgme_verify_signature
+get_part_as_string
+pgp_locate_armor_header
+prefs_gpg_auto_check_signatures
diff --git a/src/plugins/pgpmime/mypgpcore.def b/src/plugins/pgpmime/mypgpcore.def
index 5c42a4b..cad93cb 100644
--- a/src/plugins/pgpmime/mypgpcore.def
+++ b/src/plugins/pgpmime/mypgpcore.def
@@ -16,3 +16,6 @@ sgpgme_sigstat_info_full
 sgpgme_sigstat_info_short
 sgpgme_verify_signature
 cm_gpgme_data_rewind
+get_part_as_string
+pgp_locate_armor_header
+prefs_gpg_auto_check_signatures
diff --git a/src/plugins/smime/mypgpcore.def b/src/plugins/smime/mypgpcore.def
index 5c42a4b..44dd8d2 100644
--- a/src/plugins/smime/mypgpcore.def
+++ b/src/plugins/smime/mypgpcore.def
@@ -16,3 +16,4 @@ sgpgme_sigstat_info_full
 sgpgme_sigstat_info_short
 sgpgme_verify_signature
 cm_gpgme_data_rewind
+prefs_gpg_auto_check_signatures

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/pgpcore/claws.def       |    7 +++++++
 src/plugins/pgpcore/plugin.def      |    4 ++++
 src/plugins/pgpinline/mypgpcore.def |    4 ++++
 src/plugins/pgpmime/mypgpcore.def   |    3 +++
 src/plugins/smime/mypgpcore.def     |    2 ++
 src/plugins/smime/smime.c           |   32 +-------------------------------
 6 files changed, 21 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list