2005-10-25 [colin] 1.9.15cvs108

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 877034d33793e6ebb00c7a00ada38722d24c665c..31f7eb28fce3be5dd54649ba55de2f50ddfd85d1 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1427,7 +1427,7 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
        GtkTextIter start = *iter;
        GtkTextIter end_iter;
        int start_pos = gtk_text_iter_get_offset(&start);
-
+       gchar *str = NULL;
        if (!compose->account->sig_sep)
                return FALSE;
        
@@ -1435,19 +1435,23 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
                start_pos+strlen(compose->account->sig_sep));
 
        /* check sig separator */
-       if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
-                       compose->account->sig_sep)) {
+       str = gtk_text_iter_get_text(&start, &end_iter);
+       if (!strcmp(str, 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(str);
+                       g_free(tmp);
                        return TRUE;
-               
-
+               }
+               g_free(tmp);    
        }
+       g_free(str);
 
        return FALSE;
 }
@@ -5991,6 +5995,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);