2007-06-04 [colin] 2.9.2cvs39

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 8493f011dc15495eac6654c8c4d2c06594bcf4ee..1a11e10f017f6db2480a775f0171aa2a5ea3e776 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1604,7 +1604,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                }
 
                /* empty quotemark is not allowed */
-               if (qmark && !*qmark)
+               if (qmark == NULL || *qmark == '\0')
                        qmark = "> ";
 
                compose_quote_fmt(compose, full_msginfo,
@@ -7126,6 +7126,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        buffer = gtk_text_view_get_buffer(text);
 
        if (tmpl->value) {
+               /* FIXME - use per-folder/account quotemark */
                if (prefs_common.quotemark && *prefs_common.quotemark)
                        qmark = prefs_common.quotemark;
                else
@@ -9533,6 +9534,8 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                        len = strlen(text);
 
                new_text = g_strndup(text, len);
+
+               /* FIXME - use per-folder/account quotemark */
                if (prefs_common.quotemark && *prefs_common.quotemark)
                        qmark = prefs_common.quotemark;
                else