talons

commit a545a0d286fe90f7298406725787d1df58e68290
parent 7b66a4d0050e6fc4687278df07477677ed054142
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 26 Jul 2013 15:59:15 +0200

Finish previous fix

Diffstat:
M
src/plugins/pgpcore/plugin.def
 | 
3
+++
M
src/plugins/pgpinline/claws.def
 | 
1
-
M
src/plugins/pgpinline/mypgpcore.def
 | 
1
+
M
src/plugins/smime/mypgpcore.def
 | 
1
+
M
src/plugins/smime/smime.c
 | 
32
+-------------------------------

5 files changed, 6 insertions(+), 32 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;