Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

Merge release-2.x.y

Thu, 15 May 2014 17:30:56 +0200

author

Tomasz Wasilczyk <twasilczyk@pidgin.im>

date

Thu, 15 May 2014 17:30:56 +0200

changeset 36042

8542cfac74c4

parent 36039

9725f7b50000 (current diff)

parent 36041

7f35f441b939 (diff)

child 36043

d73e41243b71

Merge release-2.x.y

--- a/libpurple/protocols/simple/simple.c	Thu May 15 17:20:31 2014 +0200
+++ b/libpurple/protocols/simple/simple.c	Thu May 15 17:30:56 2014 +0200
@@ -1724,7 +1724,7 @@
 	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);