2010-12-22 [colin] 3.7.8cvs19

	* src/textview.c
		Fix wrong free

diff --git a/ChangeLog b/ChangeLog
index caa646523f96474dadb73a8f6ad8e5ca25b348c1..eb3941203afd9d0d80201eb5e6e53c1ff9ec48a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-22 [colin]     3.7.8cvs19
+
+       * src/textview.c
+               Fix wrong free
+
 2010-12-21 [colin]     3.7.8cvs18
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index fab06d6a2ee10263ccda77da853dcfd58205f0c4..6bd8695b07125eafeb72b32bf5578ab96346dfe5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4092,3 +4092,4 @@
 ( cvs diff -u -r 1.96.2.225 -r 1.96.2.226 src/textview.c;  ) > 3.7.8cvs16.patchset
 ( cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/etpan/etpan-thread-manager.c;  ) > 3.7.8cvs17.patchset
 ( cvs diff -u -r 1.149.2.101 -r 1.149.2.102 src/inc.c;  cvs diff -u -r 1.17.2.57 -r 1.17.2.58 src/send_message.c;  cvs diff -u -r 1.23.2.24 -r 1.23.2.25 src/common/session.c;  cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/common/session.h;  ) > 3.7.8cvs18.patchset
+( cvs diff -u -r 1.96.2.226 -r 1.96.2.227 src/textview.c;  ) > 3.7.8cvs19.patchset

diff --git a/configure.ac b/configure.ac
index b4f6ca00657c1c29e7ff3baf95b74df6e57522ed..adf3fee4417947e516746e14fa8d46d2807c0ef8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -153,10 +153,10 @@ if test x"$_gcc_psign" = xyes ; then
        CFLAGS="$CFLAGS -Wno-pointer-sign"
 fi
 
-CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Wall -Wno-pointer-sign"
 
 if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+       CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
 fi
 
 pthread_name=

diff --git a/src/textview.c b/src/textview.c
index b2d334a684a081940f6f74ebc2c691373ec24f09..7e4c211a330a48f036e7685e85828be32a5aa434 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -748,7 +748,6 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        } else {
                                gtk_text_buffer_insert_pixbuf(buffer, &iter, pixbuf);
                                if (textview->stop_loading) {
-                                       g_free(uri);
                                        return;
                                }
                                gtk_text_buffer_insert(buffer, &iter, " ", 1);