};
#endif
-#if USE_GPGME
static GdkColor good_sig_color = {
(gulong)0,
(gushort)0,
(gushort)0,
(gushort)0
};
-#endif
static GdkFont *text_sb_font;
static GdkFont *text_mb_font;
GtkSText *text;
FILE *fp;
const gchar *charset = NULL;
- GPtrArray *headers = NULL;
if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
gtk_stext_freeze(text);
- if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) perror("fseek");
+/*
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) perror("fseek");
headers = textview_scan_header(textview, fp);
if (headers) {
textview_show_header(textview, headers);
procheader_header_array_destroy(headers);
textview->body_pos = gtk_stext_get_length(text);
}
-
+*/
textview_add_parts(textview, mimeinfo, fp);
gtk_stext_thaw(text);
void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
GtkSText *text;
- gchar buf[BUFFSIZE];
- const gchar *boundary = NULL;
- gint boundary_len = 0;
const gchar *charset = NULL;
- GPtrArray *headers = NULL;
- gboolean is_rfc822_part = FALSE;
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
- if (mimeinfo->mime_type == MIME_MULTIPART) {
+ if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
+ ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822"))) {
textview_clear(textview);
textview_add_parts(textview, mimeinfo, fp);
return;
}
- if (mimeinfo->parent && mimeinfo->parent->boundary) {
- boundary = mimeinfo->parent->boundary;
- boundary_len = strlen(boundary);
- }
-
- if (!boundary && (mimeinfo->mime_type == MIME_TEXT ||
- mimeinfo->mime_type == MIME_TEXT_HTML ||
- mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
-
- if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
- perror("fseek");
- headers = textview_scan_header(textview, fp);
- } else {
- if (mimeinfo->mime_type == MIME_TEXT && mimeinfo->parent) {
- glong fpos;
- MimeInfo *parent = mimeinfo->parent;
-
- while (parent->parent) {
- if (parent->main &&
- parent->main->mime_type ==
- MIME_MESSAGE_RFC822)
- break;
- parent = parent->parent;
- }
-
- if ((fpos = ftell(fp)) < 0)
- perror("ftell");
- else if (fseek(fp, parent->fpos, SEEK_SET) < 0)
- perror("fseek");
- else {
- headers = textview_scan_header(textview, fp);
- if (fseek(fp, fpos, SEEK_SET) < 0)
- perror("fseek");
- }
- }
- /* skip MIME part headers */
- while (fgets(buf, sizeof(buf), fp) != NULL)
- if (buf[0] == '\r' || buf[0] == '\n') break;
- }
-
- /* display attached RFC822 single text message */
- if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
- if (headers) procheader_header_array_destroy(headers);
- if (!mimeinfo->sub) {
- textview_clear(textview);
- return;
- }
- headers = textview_scan_header(textview, fp);
- mimeinfo = mimeinfo->sub;
- is_rfc822_part = TRUE;
- }
-
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
+ perror("fseek");
+/*
+ headers = textview_scan_header(textview, fp);
+*/
if (textview->messageview->forced_charset)
charset = textview->messageview->forced_charset;
else if (prefs_common.force_charset)
gtk_stext_freeze(text);
textview_clear(textview);
+/*
if (headers) {
textview_show_header(textview, headers);
procheader_header_array_destroy(headers);
if (!mimeinfo->main)
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
}
-
- if (mimeinfo->mime_type == MIME_MULTIPART || is_rfc822_part)
+*/
+ if (mimeinfo->type == MIMETYPE_MULTIPART)
textview_add_parts(textview, mimeinfo, fp);
else
textview_write_body(textview, mimeinfo, fp, charset);
{
GtkSText *text = GTK_STEXT(textview->text);
gchar buf[BUFFSIZE];
- const gchar *boundary = NULL;
- gint boundary_len = 0;
const gchar *charset = NULL;
GPtrArray *headers = NULL;
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
- if (mimeinfo->mime_type == MIME_MULTIPART) return;
-
- if (!mimeinfo->parent &&
- mimeinfo->mime_type != MIME_TEXT &&
- mimeinfo->mime_type != MIME_TEXT_HTML &&
- mimeinfo->mime_type != MIME_TEXT_ENRICHED)
- return;
+ if (mimeinfo->type == MIMETYPE_MULTIPART) return;
- if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) {
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
perror("fseek");
return;
}
- if (mimeinfo->parent && mimeinfo->parent->boundary) {
- boundary = mimeinfo->parent->boundary;
- boundary_len = strlen(boundary);
- }
-
- while (fgets(buf, sizeof(buf), fp) != NULL)
- if (buf[0] == '\r' || buf[0] == '\n') break;
-
- if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+ if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822")) {
headers = textview_scan_header(textview, fp);
if (headers) {
gtk_stext_freeze(text);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ if (gtk_stext_get_length(text) > 0)
+ gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
textview_show_header(textview, headers);
procheader_header_array_destroy(headers);
gtk_stext_thaw(text);
gtk_stext_freeze(text);
-#if USE_GPGME
- if (mimeinfo->sigstatus)
- g_snprintf(buf, sizeof(buf), "\n[%s (%s)]\n",
- mimeinfo->content_type, mimeinfo->sigstatus);
+ if (g_hash_table_lookup(mimeinfo->parameters, "name") != NULL)
+ g_snprintf(buf, sizeof(buf), "\n[%s %s/%s (%d bytes)]\n",
+ (gchar *) g_hash_table_lookup(mimeinfo->parameters, "name"),
+ procmime_get_type_str(mimeinfo->type),
+ mimeinfo->subtype, mimeinfo->length);
else
-#endif
- if (mimeinfo->filename || mimeinfo->name)
- g_snprintf(buf, sizeof(buf), "\n[%s %s (%d bytes)]\n",
- mimeinfo->filename ? mimeinfo->filename :
- mimeinfo->name,
- mimeinfo->content_type, mimeinfo->size);
- else
- g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
- mimeinfo->content_type, mimeinfo->size);
-
-#if USE_GPGME
- if (mimeinfo->sigstatus && !mimeinfo->sigstatus_full) {
- gchar *tmp;
- /* use standard font */
- gpointer oldfont = textview->msgfont;
- textview->msgfont = NULL;
-
- tmp = g_strconcat("pgp: ", _("Check signature"), NULL);
- textview_write_link(textview, buf, tmp, NULL);
-
- /* put things back */
- textview->msgfont = (GdkFont *)oldfont;
- oldfont = NULL;
- g_free(tmp);
- } else if (mimeinfo->sigstatus) {
- GdkColor *color;
- if (!strcmp(mimeinfo->sigstatus, _("Good signature")))
- color = &good_sig_color;
- else if (!strcmp(mimeinfo->sigstatus, _("BAD signature")))
- color = &bad_sig_color;
- else
- color = &nocheck_sig_color;
- gtk_stext_insert(text, NULL, color, NULL, buf, -1);
- } else
-#endif
- if (mimeinfo->mime_type != MIME_TEXT &&
- mimeinfo->mime_type != MIME_TEXT_HTML &&
- mimeinfo->mime_type != MIME_TEXT_ENRICHED) {
+ g_snprintf(buf, sizeof(buf), "\n[%s/%s (%d bytes)]\n",
+ procmime_get_type_str(mimeinfo->type),
+ mimeinfo->subtype, mimeinfo->length);
+
+ if (mimeinfo->type != MIMETYPE_TEXT) {
gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
} else {
if (!mimeinfo->main &&
mimeinfo->parent &&
mimeinfo->parent->children != mimeinfo)
gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
- else if (prefs_common.display_header)
+ else if (prefs_common.display_header && (gtk_stext_get_length(text) > 0))
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
if (textview->messageview->forced_charset)
charset = textview->messageview->forced_charset;
gtk_stext_thaw(text);
}
-static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
+static void textview_add_parts_func(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
- gint level;
-
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
- level = mimeinfo->level;
-
- for (;;) {
+ while (mimeinfo) {
textview_add_part(textview, mimeinfo, fp);
- if (mimeinfo->parent && mimeinfo->parent->content_type &&
- !strcasecmp(mimeinfo->parent->content_type,
- "multipart/alternative"))
- mimeinfo = mimeinfo->parent->next;
- else
- mimeinfo = procmime_mimeinfo_next(mimeinfo);
- if (!mimeinfo || mimeinfo->level <= level)
- break;
+ if(mimeinfo->children)
+ textview_add_parts_func(textview, mimeinfo->children, fp);
+ mimeinfo = mimeinfo->next;
}
}
+static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
+{
+ g_return_if_fail(mimeinfo != NULL);
+ g_return_if_fail(fp != NULL);
+
+ textview_add_part(textview, mimeinfo, fp);
+ if(mimeinfo->children)
+ textview_add_parts_func(textview, mimeinfo->children, fp);
+}
+
#define TEXT_INSERT(str) \
gtk_stext_insert(text, textview->msgfont, NULL, NULL, str, -1)
gtk_stext_thaw(text);
}
-#if USE_GPGME
-void textview_show_signature_part(TextView *textview, MimeInfo *partinfo)
-{
- GtkSText *text;
-
- if (!partinfo) return;
-
- textview_set_font(textview, NULL);
- text = GTK_STEXT(textview->text);
- textview_clear(textview);
-
- gtk_stext_freeze(text);
-
- if (partinfo->sigstatus_full == NULL) {
- TEXT_INSERT(_("This signature has not been checked yet.\n"));
- TEXT_INSERT(_("To check it, pop up the context menu with\n"));
- TEXT_INSERT(_("right click and select `Check signature'.\n"));
- } else {
- TEXT_INSERT(partinfo->sigstatus_full);
- }
-
- gtk_stext_thaw(text);
-}
-#endif /* USE_GPGME */
-
#undef TEXT_INSERT
static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
conv = conv_code_converter_new(charset);
- tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
-
textview->is_in_signature = FALSE;
- if (tmpfp) {
- if (mimeinfo->mime_type == MIME_TEXT_HTML)
+ if(mimeinfo->encoding_type != ENC_BINARY &&
+ mimeinfo->encoding_type != ENC_7BIT &&
+ mimeinfo->encoding_type != ENC_8BIT)
+ procmime_decode_content(mimeinfo);
+
+
+ if (!g_strcasecmp(mimeinfo->subtype, "html")) {
+ gchar *filename;
+
+ filename = procmime_get_tmp_file_name(mimeinfo);
+ if (procmime_get_part(filename, mimeinfo) == 0) {
+ tmpfp = fopen(filename, "rb");
textview_show_html(textview, tmpfp, conv);
- else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+ fclose(tmpfp);
+ unlink(filename);
+ }
+ g_free(filename);
+ } else if (!g_strcasecmp(mimeinfo->subtype, "enriched")) {
+ gchar *filename;
+
+ filename = procmime_get_tmp_file_name(mimeinfo);
+ if (procmime_get_part(filename, mimeinfo) == 0) {
+ tmpfp = fopen(filename, "rb");
textview_show_ertf(textview, tmpfp, conv);
- else
- while (fgets(buf, sizeof(buf), tmpfp) != NULL)
- textview_write_line(textview, buf, conv);
+ fclose(tmpfp);
+ unlink(filename);
+ }
+ g_free(filename);
+ } else {
+ tmpfp = fopen(mimeinfo->filename, "rb");
+ fseek(tmpfp, mimeinfo->offset, SEEK_SET);
+ debug_print("Viewing text content of type: %s (length: %d)\n", mimeinfo->subtype, mimeinfo->length);
+ while ((fgets(buf, sizeof(buf), tmpfp) != NULL) &&
+ (ftell(tmpfp) <= mimeinfo->offset + mimeinfo->length))
+ textview_write_line(textview, buf, conv);
fclose(tmpfp);
}
g_return_val_if_fail(str != NULL, FALSE);
- len = get_wcs_len(str);
+ len = get_mbs_len(str);
g_return_val_if_fail(len >= 0, FALSE);
pos = textview->cur_pos;
case GDK_y:
case GDK_t:
case GDK_l:
- if (messageview->type == MVIEW_MIME &&
- textview == messageview->mimeview->textview) {
- KEY_PRESS_EVENT_STOP();
- mimeview_pass_key_press_event(messageview->mimeview,
- event);
- break;
- }
+ KEY_PRESS_EVENT_STOP();
+ mimeview_pass_key_press_event(messageview->mimeview,
+ event);
/* fall through */
default:
if (summaryview &&
if (textview->cur_pos >= uri->start &&
textview->cur_pos <= uri->end) {
+ gchar *trimmed_uri;
+
+ trimmed_uri = trim_string(uri->uri, 60);
/* single click: display url in statusbar */
if (event->button == 1 && textview->last_buttonpress != GDK_2BUTTON_PRESS) {
if (textview->messageview->mainwin) {
textview->show_url_msgid = gtk_statusbar_push(
GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
textview->messageview->mainwin->folderview_cid,
- uri->uri);
+ trimmed_uri);
textview->show_url_timeout_tag = gtk_timeout_add( 4000, show_url_timeout_cb, textview );
gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
}
}
compose_new(account, uri->uri + 7, NULL);
}
- } else
-#if USE_GPGME
- if (!g_strncasecmp(uri->uri, "pgp:", 4)) {
- GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(textview->scrolledwin));
- gfloat vpos = pos->value;
- mimeview_check_signature(textview->messageview->mimeview);
- /* scroll back where we were */
- gtk_adjustment_set_value(pos, vpos);
- } else
-#endif
- {
+ } else {
open_uri(uri->uri,
prefs_common.uri_cmd);
}
+ g_free(trimmed_uri);
}
}
}
projects / claws.git / blobdiff