# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190431271 0
# Node ID 964014aee978009014a1721d56153434c06e644c
# Parent  7d072354544ade3912c52305b6368194e5fa3a9e# Parent  2f1c4b2716ea90fe0a7c085b3da28dd0bcf40a08
merge of '025faf23aaac403798451974c320c4de6df470d5'
     and '5c5edb6508adac74635924c3b6fa2676a92323e3'

diff -r 2f1c4b2716ea -r 964014aee978 finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c	Fri Sep 21 12:56:21 2007 +0000
+++ b/finch/libgnt/gntmain.c	Sat Sep 22 03:21:11 2007 +0000
@@ -409,7 +409,8 @@
 	case SIGWINCH:
 		erase();
 		g_idle_add(refresh_screen, NULL);
-		org_winch_handler(sig);
+		if (org_winch_handler)
+			org_winch_handler(sig);
 		signal(SIGWINCH, sighandler);
 		break;
 #endif
diff -r 2f1c4b2716ea -r 964014aee978 libpurple/protocols/msn/httpconn.c
--- a/libpurple/protocols/msn/httpconn.c	Fri Sep 21 12:56:21 2007 +0000
+++ b/libpurple/protocols/msn/httpconn.c	Sat Sep 22 03:21:11 2007 +0000
@@ -663,6 +663,8 @@
 	httpconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
 	httpconn->tx_handler = 0;
 
+	httpconn->fd = -1;
+
 	return httpconn;
 }
 
diff -r 2f1c4b2716ea -r 964014aee978 libpurple/protocols/msn/servconn.c
--- a/libpurple/protocols/msn/servconn.c	Fri Sep 21 12:56:21 2007 +0000
+++ b/libpurple/protocols/msn/servconn.c	Sat Sep 22 03:21:11 2007 +0000
@@ -53,6 +53,8 @@
 	servconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
 	servconn->tx_handler = 0;
 
+	servconn->fd = -1;
+
 	return servconn;
 }