From fc661fb23aee42e87370886a17ed9373388d7493 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 25 Jul 2000 21:14:58 +0000 Subject: add textual exception printout. (set_editor_text): close pre tags & check 2000-07-25 Michael Meeks * 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 * mail-config.c (create_identity_page): set default signature to ~/.signature 2000-07-25 Michael Meeks * backend/ebook/load-pine-addressbook.c (book_open_cb): check we opened ok. svn path=/trunk/; revision=4330 --- composer/e-msg-composer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'composer/e-msg-composer.c') 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
\n
\n--\n%s
",
-					    text, sig);
+		if (!strncmp ("--\n", sig, sizeof ("--\n")))
+			fulltext = g_strdup_printf ("%s
\n
\n%s
",
+						    text, sig);
+		else
+			fulltext = g_strdup_printf ("%s
\n
\n--\n%s
",
+						    text, sig);
 	} else {
 		if (!*text)
 			return;
-- 
cgit v1.2.3