*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
if (!textdata)
return FALSE;
- if (data == NULL) {
- data = pgpinline_new_privacydata();
- mimeinfo->privacy = (PrivacyData *) data;
- }
- data->done_sigtest = TRUE;
- data->is_signed = FALSE;
-
if ((sigpos = strstr(textdata, sig_indicator)) == NULL) {
g_free(textdata);
return FALSE;
g_free(textdata);
+ if (data == NULL) {
+ data = pgpinline_new_privacydata();
+ mimeinfo->privacy = (PrivacyData *) data;
+ }
+ data->done_sigtest = TRUE;
data->is_signed = TRUE;
return TRUE;
/* gtk2: convert back from utf8 */
tmp = conv_codeset_strdup(textdata, CS_UTF_8,
procmime_mimeinfo_get_parameter(mimeinfo, "charset"));
+ if (!tmp) {
+ tmp = conv_codeset_strdup(textdata, CS_UTF_8,
+ conv_get_locale_charset_str_no_utf8());
+ }
+ if (!tmp) {
+ g_warning("Can't convert charset to anything sane\n");
+ tmp = conv_codeset_strdup(textdata, CS_UTF_8, CS_US_ASCII);
+ }
g_free(textdata);
+
+ if (!tmp)
+ return 0;
+
textdata = g_strdup(tmp);
g_free(tmp);
PrivacyDataPGP *data = NULL;
gpgme_ctx_t ctx;
gchar *chars;
- int len;
+ size_t len;
if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR)
return NULL;
procmime_decode_content(msgcontent);
fp = my_tmpfile();
+ if (fp == NULL) {
+ perror("my_tmpfile");
+ return FALSE;
+ }
procmime_write_mimeinfo(msgcontent, fp);
rewind(fp);
procmime_decode_content(msgcontent);
fp = my_tmpfile();
+ if (fp == NULL) {
+ perror("my_tmpfile");
+ return FALSE;
+ }
procmime_write_mimeinfo(msgcontent, fp);
rewind(fp);