aboutsummaryrefslogtreecommitdiffstats
path: root/em-format
diff options
context:
space:
mode:
Diffstat (limited to 'em-format')
-rw-r--r--em-format/em-format-quote.c50
-rw-r--r--em-format/em-format-quote.h2
-rw-r--r--em-format/em-format.c39
-rw-r--r--em-format/em-format.h4
-rw-r--r--em-format/em-stripsig-filter.c2
-rw-r--r--em-format/em-stripsig-filter.h2
6 files changed, 50 insertions, 49 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 5503cca916..7918b94d88 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -211,7 +211,7 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const char *l
g_free (mhtml);
}
-static char *addrspec_hdrs[] = {
+static const gchar *addrspec_hdrs[] = {
"Sender", "From", "Reply-To", "To", "Cc", "Bcc",
"Resent-Sender", "Resent-from", "Resent-Reply-To",
"Resent-To", "Resent-cc", "Resent-Bcc", NULL
@@ -285,22 +285,22 @@ static void
canon_header_name (char *name)
{
char *inptr = name;
-
+
/* canonicalise the header name... first letter is
* capitalised and any letter following a '-' also gets
* capitalised */
-
+
if (*inptr >= 'a' && *inptr <= 'z')
*inptr -= 0x20;
-
+
inptr++;
-
+
while (*inptr) {
if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z')
*inptr -= 0x20;
else if (*inptr >= 'A' && *inptr <= 'Z')
*inptr += 0x20;
-
+
inptr++;
}
}
@@ -326,24 +326,24 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const
break;
}
}
-
+
label = _(name);
-
+
if (addrspec) {
struct _camel_header_address *addrs;
GString *html;
if (!(txt = camel_medium_get_header (part, name)))
return;
-
+
buf = camel_header_unfold (txt);
if (!(addrs = camel_header_address_decode (txt, emf->charset ? emf->charset : emf->default_charset))) {
g_free (buf);
return;
}
-
+
g_free (buf);
-
+
html = g_string_new ("");
emfq_format_address (html, addrs);
camel_header_address_unref (addrs);
@@ -361,15 +361,15 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const
if (!(txt = camel_medium_get_header (part, "x-newsreader")))
if (!(txt = camel_medium_get_header (part, "x-mimeole")))
return;
-
+
txt = value = camel_header_format_ctext (txt, charset);
-
+
label = _("Mailer");
flags |= EM_FORMAT_HEADER_BOLD;
} else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) {
if (!(txt = camel_medium_get_header (part, name)))
return;
-
+
flags |= EM_FORMAT_HEADER_BOLD;
} else {
txt = camel_medium_get_header (part, name);
@@ -562,18 +562,18 @@ emfq_ignore(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHan
}
static EMFormatHandler type_builtin_table[] = {
- { "text/plain",(EMFormatFunc)emfq_text_plain },
- { "text/enriched",(EMFormatFunc)emfq_text_enriched },
- { "text/richtext",(EMFormatFunc)emfq_text_enriched },
- { "text/html",(EMFormatFunc)emfq_text_html },
-/* { "multipart/related",(EMFormatFunc)emfq_multipart_related },*/
- { "message/external-body", (EMFormatFunc)emfq_ignore },
- { "multipart/appledouble", (EMFormatFunc)emfq_ignore },
+ { (gchar *) "text/plain", (EMFormatFunc)emfq_text_plain },
+ { (gchar *) "text/enriched", (EMFormatFunc)emfq_text_enriched },
+ { (gchar *) "text/richtext", (EMFormatFunc)emfq_text_enriched },
+ { (gchar *) "text/html", (EMFormatFunc)emfq_text_html },
+/* { (gchar *) "multipart/related",(EMFormatFunc)emfq_multipart_related },*/
+ { (gchar *) "message/external-body", (EMFormatFunc)emfq_ignore },
+ { (gchar *) "multipart/appledouble", (EMFormatFunc)emfq_ignore },
/* internal evolution types */
- { "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html },
- { "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message },
- { "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix },
+ { (gchar *) "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html },
+ { (gchar *) "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message },
+ { (gchar *) "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix },
};
static void
diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index d34548a3a6..8aca4b8e3f 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 7128644052..c2669e7c5b 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -239,7 +239,7 @@ em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info)
{
d(printf("adding format handler to '%s' '%s'\n", g_type_name_from_class((GTypeClass *)emfc), info->mime_type));
info->old = g_hash_table_lookup(emfc->type_handlers, info->mime_type);
- g_hash_table_insert(emfc->type_handlers, info->mime_type, info);
+ g_hash_table_insert(emfc->type_handlers, (gpointer) info->mime_type, info);
}
struct _class_handlers {
@@ -294,7 +294,7 @@ em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info)
if (current == info) {
current = info->old;
if (current)
- g_hash_table_insert(emfc->type_handlers, current->mime_type, current);
+ g_hash_table_insert(emfc->type_handlers, (gpointer) current->mime_type, current);
else
g_hash_table_remove(emfc->type_handlers, info->mime_type);
} else {
@@ -1591,8 +1591,9 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
if (puri->func == emf_write_related) {
g_string_printf(emf->part_id, "%s", puri->part_id);
em_format_part(emf, stream, puri->part);
- } else
+ } else {
d(printf("unreferenced uri generated by format code: %s\n", puri->uri?puri->uri:puri->cid));
+ }
}
puri = purin;
purin = purin->next;
@@ -1829,28 +1830,28 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart
static EMFormatHandler type_builtin_table[] = {
#ifdef ENABLE_SMIME
- { "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
+ { (gchar *) "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
#endif
- { "multipart/alternative", emf_multipart_alternative },
- { "multipart/appledouble", emf_multipart_appledouble },
- { "multipart/encrypted", emf_multipart_encrypted },
- { "multipart/mixed", emf_multipart_mixed },
- { "multipart/signed", emf_multipart_signed },
- { "multipart/related", emf_multipart_related },
- { "multipart/*", emf_multipart_mixed },
- { "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
- { "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
- { "message/delivery-status", emf_message_deliverystatus },
- { "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
+ { (gchar *) "multipart/alternative", emf_multipart_alternative },
+ { (gchar *) "multipart/appledouble", emf_multipart_appledouble },
+ { (gchar *) "multipart/encrypted", emf_multipart_encrypted },
+ { (gchar *) "multipart/mixed", emf_multipart_mixed },
+ { (gchar *) "multipart/signed", emf_multipart_signed },
+ { (gchar *) "multipart/related", emf_multipart_related },
+ { (gchar *) "multipart/*", emf_multipart_mixed },
+ { (gchar *) "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
+ { (gchar *) "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
+ { (gchar *) "message/delivery-status", emf_message_deliverystatus },
+ { (gchar *) "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE },
/* Insert brokenly-named parts here */
#ifdef ENABLE_SMIME
- { "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
+ { (gchar *) "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
#endif
/* internal types */
- { "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed },
- { "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted },
+ { (gchar *) "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed },
+ { (gchar *) "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted },
};
static void
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 281766140e..a9d9356778 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -85,7 +85,7 @@ typedef enum _em_format_mode_t {
*
**/
struct _EMFormatHandler {
- char *mime_type;
+ gchar *mime_type;
EMFormatFunc handler;
guint32 flags;
diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c
index 7dd8a87416..1600eeaed0 100644
--- a/em-format/em-stripsig-filter.c
+++ b/em-format/em-stripsig-filter.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h
index be72cef3df..761d46691f 100644
--- a/em-format/em-stripsig-filter.h
+++ b/em-format/em-stripsig-filter.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 14:18:31 +0800