aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index e70da84b40..dd212d2cc6 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-26 Radek Doulik <rodo@ximian.com>
+
+ * e-msg-composer.c (do_exit): don't assert on default, when ESC is
+ pressed, the dialog is closed as well and we get button number -1
+
2002-07-26 Ettore Perazzoli <ettore@ximian.com>
* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type):
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index c1b493b65c..426830d0e7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -950,9 +950,12 @@ get_signature_html (EMsgComposer *composer)
* section 4.3.2.
*/
html = g_strdup_printf ("<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->"
+ "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"%s%s\">-->"
"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD>"
"%s%s%s%s"
"</TD></TR></TABLE>",
+ composer->signature ? "name:" : "auto",
+ composer->signature ? composer->signature->name : "",
format_html ? "" : "<PRE>\n",
format_html || (!strncmp ("-- \n", text, 4) || strstr(text, "\n-- \n")) ? "" : "-- \n",
text,
@@ -1433,10 +1436,8 @@ do_exit (EMsgComposer *composer)
case 1: /* Don't save */
gtk_widget_destroy (GTK_WIDGET (composer));
break;
- case 2: /* Cancel */
+ default: /* Cancel */
break;
- default:
- g_assert_not_reached ();
}
}