/pidgin/main: 8542cfac74c4: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: 8542cfac74c4b0edb0cbf01e9e2d4ee370f2f209
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-15 17:30 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/8542cfac74c4

Description:

Merge release-2.x.y

diffstat:

 libpurple/protocols/simple/simple.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -1724,7 +1724,7 @@ static void simple_newconn_cb(gpointer d
 	int newfd;
 
 	newfd = accept(source, NULL, NULL);
-	g_return_if_fail(newfd > 0);
+	g_return_if_fail(newfd >= 0);
 
 	_purple_network_set_common_socket_flags(newfd);