aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-display.c26
-rw-r--r--mail/mail-format.c31
3 files changed, 32 insertions, 31 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5349753c8c..0fbcac4fb1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (setup_mime_tables): Don't setup a handler for
+ multipart/digest.
+ (handle_multipart_digest): Removed.
+
2002-07-31 Jeffrey Stedfast <fejj@ximian.com>
* Makefile.am: Removed folder-browser-window from the build.
diff --git a/mail/mail-display.c b/mail/mail-display.c
index e2aa411744..3a934e1b75 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1,14 +1,30 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * mail-display.c: Mail display widget
+ * Authors: Dan Winship <danw@ximian.com>
+ * Jeffrey Stedfast <fejj@ximian.com>
+ * Michael Zucchi <notzed@ximian.com>
+ * Miguel de Icaza <miguel@ximian.com>
+ * Larry Ewing <lewing@ximian.com>
*
- * Author:
- * Miguel de Icaza
- * Bertrand Guiheneuf (bg@aful.org)
+ * Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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 Street #330, Boston, MA 02111-1307, USA.
*
- * (C) 2000 Ximian, Inc.
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 946e4f0cc5..5e41298c32 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Authors:
- * Dan Winship <danw@ximian.com>
+ * Authors: Dan Winship <danw@ximian.com>
+ * Jeffrey Stedfast <fejj@ximian.com>
*
* Copyright 2000, 2001 Ximian, Inc.
*
@@ -21,12 +21,13 @@
*
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <ctype.h> /* for isprint */
#include <string.h> /* for strstr */
+#include <ctype.h>
#include <fcntl.h>
#include <liboaf/liboaf.h>
@@ -92,9 +93,6 @@ static gboolean handle_multipart_encrypted (CamelMimePart *part,
static gboolean handle_multipart_signed (CamelMimePart *part,
const char *mime_type,
MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
-static gboolean handle_multipart_digest (CamelMimePart *part,
- const char *mime_type,
- MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
static gboolean handle_message_rfc822 (CamelMimePart *part,
const char *mime_type,
MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
@@ -345,8 +343,6 @@ setup_mime_tables (void)
handle_multipart_encrypted);
g_hash_table_insert (mime_function_table, "multipart/signed",
handle_multipart_signed);
- g_hash_table_insert (mime_function_table, "multipart/digest",
- handle_multipart_digest);
/* RFC 2046 says unrecognized text subtypes can be treated
* as text/plain (as long as you recognize the character set),
@@ -1143,7 +1139,7 @@ mail_format_get_data_wrapper_text (CamelDataWrapper *wrapper, MailDisplay *mail_
camel_object_unref (CAMEL_OBJECT (filtered_stream));
for (text = ba->data, end = text + ba->len; text < end; text++) {
- if (!isspace ((unsigned char)*text))
+ if (!isspace ((unsigned char) *text))
break;
}
@@ -1718,23 +1714,6 @@ handle_multipart_mixed (CamelMimePart *part, const char *mime_type,
}
static gboolean
-handle_multipart_digest (CamelMimePart *part, const char *mime_type,
- MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream)
-{
- CamelDataWrapper *wrapper =
- camel_medium_get_content_object (CAMEL_MEDIUM (part));
-
- g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
-
- gtk_html_stream_printf (stream, "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"digest:\"><img align=\"middle\" src=\"%s\"></a>"
- "&nbsp;<a href=\"digest:\">%s</a>",
- mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR "/envelope.png"),
- U_("View messages..."));
-
- return TRUE;
-}
-
-static gboolean
handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream)
{