Mercurial > pidgin.yaz

changeset 20649:964014aee978

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '025faf23aaac403798451974c320c4de6df470d5' and '5c5edb6508adac74635924c3b6fa2676a92323e3'
author Luke Schierer <lschiere@pidgin.im>
date Sat, 22 Sep 2007 03:21:11 +0000
parents 7d072354544a (diff) 2f1c4b2716ea (current diff)
children 31f4199a4cd4
files
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 }
 
--- 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;
 }