2007-11-16 [wwp] 3.0.2cvs141

	* src/common/utils.c
		Fix for 3.0.2cvs140, prevents from crashing when opening
		a compose window.

diff --git a/ChangeLog b/ChangeLog
index 6c60a71e2c2f5a3d5b1955f9164937a4b787d9b3..59ae420d77e04be7cd5e181d871c20b39ef5f5ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-16 [wwp]       3.0.2cvs141
+
+       * src/common/utils.c
+               Fix for 3.0.2cvs140, prevents from crashing when opening
+               a compose window.
+
 2007-11-16 [colin]     3.0.2cvs140
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 0b706c8a40157dbe4a29462aebb6f780222e2afe..bd5c08778cf911c3e8bb83c64bc02e92151e483b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3053,3 +3053,4 @@
 ( cvs diff -u -r 1.101.2.45 -r 1.101.2.46 src/news.c;  ) > 3.0.2cvs138.patchset
 ( cvs diff -u -r 1.382.2.420 -r 1.382.2.421 src/compose.c;  cvs diff -u -r 1.36.2.123 -r 1.36.2.124 src/common/utils.c;  cvs diff -u -r 1.20.2.54 -r 1.20.2.55 src/common/utils.h;  ) > 3.0.2cvs139.patchset
 ( cvs diff -u -r 1.115.2.175 -r 1.115.2.176 src/main.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/claws.c;  ) > 3.0.2cvs140.patchset
+( cvs diff -u -r 1.36.2.124 -r 1.36.2.125 src/common/utils.c;  ) > 3.0.2cvs141.patchset

diff --git a/configure.ac b/configure.ac
index db22c1511da1c560e00b661bdb135b12dec19c55..a862cf717974e988c7f0b94f107f915f7e0c95b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=140
+EXTRA_VERSION=141
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 1bc69c9af756432b2c443e977a350b5b109f7d99..f49f1f1ca16cc79107dece355c63fae71b3913a3 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1606,7 +1606,8 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                }
        }
 
-       *attach = my_att;
+       if (attach)
+               *attach = my_att;
        return 0;
 }