2005-10-25 [colin] 1.9.15cvs107

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 642db7f2b16116d81fdcf7a352d800df99121dd9..98a0cadc3a742b655d05ed1a6c76024c4ed266b0 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1437,15 +1437,18 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
        /* check sig separator */
        if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
                        compose->account->sig_sep)) {
+               gchar *tmp = NULL;
                /* check end of line (\n) */
                gtk_text_buffer_get_iter_at_offset(textbuf, &start,
                        start_pos+strlen(compose->account->sig_sep));
                gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
                        start_pos+strlen(compose->account->sig_sep)+1);
-
-               if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),"\n"));
+               tmp = gtk_text_iter_get_text(&start, &end_iter);
+               if (!strcmp(tmp,"\n")) {
+                       g_free(tmp);
                        return TRUE;
-               
+               }
+               g_free(tmp);    
 
        }
 
@@ -2231,6 +2234,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        compose_entry_append(compose,
                            msginfo->folder->prefs->default_reply_to,
                            COMPOSE_TO);
+                       compose_entry_mark_default_to(compose,
+                               msginfo->folder->prefs->default_reply_to);
                } else {
                        gchar *tmp1 = NULL;
                        Xstrdup_a(tmp1, msginfo->from, return);
@@ -5989,6 +5994,9 @@ static void compose_destroy(Compose *compose)
        g_free(compose->exteditor_file);
 
        g_free(compose->orig_charset);
+
+       g_free(compose->privacy_system);
+
        if (addressbook_get_target_compose() == compose)
                addressbook_set_target_compose(NULL);