#include "alertpanel.h"
#include "timing.h"
#include "privacy.h"
+#include "account.h"
static GHashTable *procmime_get_mime_type_table (void);
static MimeInfo *procmime_scan_file_short(const gchar *filename);
if (mimeinfo->privacy)
privacy_free_privacydata(mimeinfo->privacy);
+ g_free(mimeinfo);
+
return FALSE;
}
g_node_destroy(node);
- g_free(mimeinfo);
*mimeinfo_ptr = NULL;
}
gint llen = 0; \
strretchomp(lastline); \
llen = strlen(lastline); \
- if (lastline[llen-1] == ' ' && strcmp(lastline,"-- ")) { \
+ if (lastline[llen-1] == ' ' && !account_signatures_matchlist_str_found(lastline, "%s") && \
+ !(llen == 2 && lastline[1] == ' ' && strchr(prefs_common.quote_chars, lastline[0]))) { \
/* this is flowed */ \
if (delsp) \
lastline[llen-1] = '\0'; \
tmp_file = TRUE;
readend = mimeinfo->offset + mimeinfo->length;
+ account_signatures_matchlist_create(); /* FLUSH_LASTLINE will use it */
+
+ *buf = '\0';
if (encoding == ENC_QUOTED_PRINTABLE) {
while ((ftell(infp) < readend) && (SC_FGETS(buf, sizeof(buf), infp) != NULL)) {
gint len;
len = qp_decode_line(buf);
- buf[len]='\0';
+ buf[len] = '\0';
if (!flowed) {
if (SC_FWRITE(buf, 1, len, outfp) < len)
err = TRUE;
procmime_fclose(outfp);
procmime_fclose(infp);
+ account_signatures_matchlist_delete();
+
if (err == TRUE) {
return FALSE;
}