2007-05-25 [paul] 2.9.2cvs15

	* src/common/socket.c
		fix sometimes crasher on cancelling
		message sending

diff --git a/ChangeLog b/ChangeLog
index a39f3a396f834a912f21db74f100ae1df82f2604..764610d593984056c658a871d2941a695987ca2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25 [paul]      2.9.2cvs15
+
+       * src/common/socket.c
+               fix sometimes crasher on cancelling
+               message sending
+
 2007-05-25 [colin]     2.9.2cvs14
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index bb1fd6522f0a5091518a16b78008da4fbeffd2f7..cf0078e344fd42d2d79b1bf6c62fafc0a386e292 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2590,3 +2590,4 @@
 ( cvs diff -u -r 1.22.2.30 -r 1.22.2.31 src/quote_fmt_parse.y;  ) > 2.9.2cvs12.patchset
 ( cvs diff -u -r 1.382.2.379 -r 1.382.2.380 src/compose.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_quote.c;  cvs diff -u -r 1.12.2.43 -r 1.12.2.44 src/prefs_template.c;  cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/prefs_template.h;  cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/quote_fmt.c;  cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/quote_fmt.h;  cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.31 -r 1.22.2.32 src/quote_fmt_parse.y;  ) > 2.9.2cvs13.patchset
 ( cvs diff -u -r 1.179.2.173 -r 1.179.2.174 src/imap.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/imap_gtk.c;  ) > 2.9.2cvs14.patchset
+( cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/common/socket.c;  ) > 2.9.2cvs15.patchset

diff --git a/configure.ac b/configure.ac
index e5813ca22603048e0c7304de4d37906cc869f4cc..8578485e0440f544a692d5d1b533f9461c88302b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/socket.c b/src/common/socket.c
index ad6921064a88aecd35c5ac0c417935c451ee2fbe..692cf876b3346288bd56644b1ec8cd2abb7ca77b 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -447,6 +447,9 @@ static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition,
 guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
                     gpointer data)
 {
+       if (!sock)
+               return FALSE;
+
        sock->callback = func;
        sock->condition = condition;
        sock->data = data;