diff options
| author | Michael Meeks <michael@helixcode.com> | 2000-07-26 05:14:58 +0800 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-07-26 05:14:58 +0800 |
| commit | fc661fb23aee42e87370886a17ed9373388d7493 (patch) | |
| tree | 87c42613e351c740c2240d03d703d98427d76d2f /composer | |
| parent | 120687c8a8b3b7df579f2dcad8badefb67e4d30b (diff) | |
| download | gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar.gz gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar.bz2 gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar.lz gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar.xz gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.tar.zst gsoc2013-evolution-fc661fb23aee42e87370886a17ed9373388d7493.zip | |
add textual exception printout. (set_editor_text): close pre tags & check
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 Michael Meeks <michael@helixcode.com>
* mail-config.c (create_identity_page): set default signature to
~/.signature
2000-07-25 Michael Meeks <michael@helixcode.com>
* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
opened ok.
svn path=/trunk/; revision=4330
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; |