aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-display.c45
2 files changed, 7 insertions, 43 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 28033674e8..9e61a0de60 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-20 Dan Winship <danw@helixcode.com>
+
+ * mail-display.c: update for bonobo change, and remove a
+ now-unused variable.
+
2000-04-17 Chris Toshok <toshok@helixcode.com>
* message-list.c (on_row_selection_idle): new function, actually
diff --git a/mail/mail-display.c b/mail/mail-display.c
index d36cf5cd20..b365df7232 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -24,47 +24,6 @@
static GtkObjectClass *mail_display_parent_class;
-
-
-static gchar default_header_html_string[] = "\n\
-<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">\n\
-<html>\n\
-<head>\n\
- <meta name=\"GENERATOR\" content=\"Evolution Mail Component (Rhon Rhon release)\">\n\
-</head>\n\
-<body text=\"#000000\" bgcolor=\"#999999\">\n\
-<table CELLSPACING=0 WIDTH=\"100\%\">\n\
-<tr>\n\
-<td><b>From:&nbsp;</b></td>\n\
-<td><b>To:&nbsp;</b></td>\n\
-</tr>\n\
-\n\
-<tr>\n\
-<td><b>Subject:&nbsp;</b></td>\n\
-<td><b>Cc:&nbsp;</b></td>\n\
-</tr>\n\
-</table>\n\
-</body>\n\
-</html>\n\
-";
-
-
-
-static gchar default_body_html_string[] = "\n\
-<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">\n\
-<html>\n\
-<head>\n\
- <meta name=\"GENERATOR\" content=\"Evolution Mail Component (Rhon Rhon release)\">\n\
-</head>\n\
-<body text=\"#000000\" bgcolor=\"#FFFFFF\">\n\
-<center>\n\
-Nothing to display in this view\n\
-</center>\n\
-</body>\n\
-</html>\n\
-";
-
-
/*----------------------------------------------------------------------*
* Helper utility functions
*----------------------------------------------------------------------*/
@@ -78,7 +37,7 @@ hydrate_persist_stream_from_gstring (Bonobo_PersistStream persist_stream,
{
CORBA_Environment ev;
BonoboStream* mem_stream =
- bonobo_stream_mem_create (gstr->str, gstr->len, TRUE);
+ bonobo_stream_mem_create (gstr->str, gstr->len, TRUE, FALSE);
CORBA_Object mem_stream_corba =
bonobo_object_corba_objref (BONOBO_OBJECT (mem_stream));
@@ -257,7 +216,7 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, void *unused)
CORBA_Object_release (persist, &ev);
CORBA_exception_free (&ev);
- g_string_free (camel_stream_gstr, FALSE);
+ g_string_free (camel_stream_gstr, TRUE);
}