2005-10-25 [colin] 1.9.15cvs108

	* src/compose.c
		Fix a second leak

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 9d7b02942f7eccfd99fdd69946d5acd33a5238a8..155a737e931c9fe910aabc381f369a154036da13 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-10-25 [colin]     1.9.15cvs108
+
+       * src/compose.c
+               Fix a second leak
+
 2005-10-25 [colin]     1.9.15cvs107
 
        * src/addrbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 5da942ae673bc0b05e5133e58c742589b8b05515..1609b1561e131a3fbeaca6072377d70ecee5b18b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -944,3 +944,4 @@
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset
 ( cvs diff -u -r 1.83.2.49 -r 1.83.2.50 src/mimeview.c;  ) > 1.9.15cvs106.patchset
 ( cvs diff -u -r 1.22.2.5 -r 1.22.2.6 src/addrbook.c;  cvs diff -u -r 1.28.2.11 -r 1.28.2.12 src/addrindex.c;  cvs diff -u -r 1.382.2.188 -r 1.382.2.189 src/compose.c;  cvs diff -u -r 1.49.2.64 -r 1.49.2.65 src/procmime.c;  ) > 1.9.15cvs107.patchset
+( cvs diff -u -r 1.382.2.189 -r 1.382.2.190 src/compose.c;  ) > 1.9.15cvs108.patchset

diff --git a/configure.ac b/configure.ac
index 905413175a9f360bb2c689ac86c86ad47c9afe58..fa9955469e30cd1fd462b216a3ef124737033555 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=107
+EXTRA_VERSION=108
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 98a0cadc3a742b655d05ed1a6c76024c4ed266b0..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,8 +1435,8 @@ 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,
@@ -1445,12 +1445,13 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
                        start_pos+strlen(compose->account->sig_sep)+1);
                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;
 }