+2003-10-21 [christoph] 0.9.6claws40
+
+ * src/procmime.[ch]
+ * src/textview.c
+ remove obsolete charset parameter in MimeInfo and fix
+ TextView to use the charset from the parameter hash table
+
+ * src/plugins/dillo_viewer/Makefile.am
+ * src/plugins/trayicon/Makefile.am
+ add OPENSSL_CFLAGS to fix building with using
+ --with-openssl-* parameters
+
2003-10-21 [paul] 0.9.6claws39
* src/prefs_matcher.[ch]
MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
else
AM_CPPFLAGS = \
$(ASPELL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(OPENSSL_CFLAGS)
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(ASPELL_CFLAGS)
+ $(ASPELL_CFLAGS) \
+ $(OPENSSL_CFLAGS)
EXTRA_DIST = \
README \
MimeInfo *mimeinfo = (MimeInfo *) node->data;
g_free(mimeinfo->encoding);
- g_free(mimeinfo->charset);
g_free(mimeinfo->name);
g_free(mimeinfo->content_disposition);
if(mimeinfo->tmpfile)
H_SUBJECT = 4
};
+const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *name)
+{
+ g_return_val_if_fail(mimeinfo != NULL, NULL);
+ g_return_val_if_fail(name != NULL, NULL);
+
+ return g_hash_table_lookup(mimeinfo->parameters, name);
+}
+
gboolean procmime_decode_content(MimeInfo *mimeinfo)
{
gchar buf[BUFFSIZE];
}
src_codeset = prefs_common.force_charset
- ? prefs_common.force_charset : mimeinfo->charset;
+ ? prefs_common.force_charset :
+ procmime_mimeinfo_get_parameter(mimeinfo, "charset");
renderer = NULL;
{
gchar *encoding;
- gchar *charset;
gchar *name;
gchar *content_disposition;
MimeInfo *procmime_scan_message (MsgInfo *msginfo);
void procmime_scan_multipart_message (MimeInfo *mimeinfo,
FILE *fp);
+const gchar *procmime_mimeinfo_get_parameter
+ (MimeInfo *mimeinfo,
+ const gchar *name);
/* scan headers */
charset = textview->messageview->forced_charset;
else if (prefs_common.force_charset)
charset = prefs_common.force_charset;
- else if (mimeinfo->charset)
- charset = mimeinfo->charset;
+ else
+ charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
textview_set_font(textview, charset);
textview_clear(textview);
charset = textview->messageview->forced_charset;
else if (prefs_common.force_charset)
charset = prefs_common.force_charset;
- else if (mimeinfo->charset)
- charset = mimeinfo->charset;
+ else
+ charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
textview_set_font(textview, charset);
charset = textview->messageview->forced_charset;
else if (prefs_common.force_charset)
charset = prefs_common.force_charset;
- else if (mimeinfo->charset)
- charset = mimeinfo->charset;
+ else
+ charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+
textview_write_body(textview, mimeinfo, charset);
}