diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 741050a070..9ae33b15d5 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2000-07-25 Michael Meeks <michael@helixcode.com> + + * e-msg-composer.c (get_text): add textual exception printout. + (set_editor_text): close pre tags & check for pre-existing + sig separator. + 2000-07-25 Peter Williams <peterw@helixcode.com> * e-msg-composer.c (menu_file_insert_file_cb): Mark this function diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index b6ae464575..90f019b11e 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -101,7 +101,8 @@ get_text (Bonobo_PersistStream persist, char *format) Bonobo_PersistStream_save (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)), format, &ev); if (ev._major != CORBA_NO_EXCEPTION) { - /* FIXME. Some error message. */ + g_warning ("Exception getting mail '%s'", + bonobo_exception_get_txt (&ev)); return NULL; } @@ -365,8 +366,12 @@ set_editor_text (BonoboWidget *editor, const char *text) sig = get_signature (); if (sig) { - fulltext = g_strdup_printf ("%s<BR>\n<PRE>\n--\n%s<PRE>", - text, sig); + if (!strncmp ("--\n", sig, sizeof ("--\n"))) + fulltext = g_strdup_printf ("%s<BR>\n<PRE>\n%s</PRE>", + text, sig); + else + fulltext = g_strdup_printf ("%s<BR>\n<PRE>\n--\n%s</PRE>", + text, sig); } else { if (!*text) return; |