Mercurial > pidgin.yaz

diff libpurple/util.c @ 32680:4c64383f05cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
purple_ip_address_is_valid() now checks for an IPv4 or IPv6 address.
author andrew.victor@mxit.com
date Sat, 24 Sep 2011 22:20:58 +0000
parents 904686722499
children 0f94ec89f0bc 5525312cf589
line wrap: on
line diff
--- a/libpurple/util.c	Sat Sep 24 22:09:40 2011 +0000
+++ b/libpurple/util.c	Sat Sep 24 22:20:58 2011 +0000
@@ -4454,11 +4454,10 @@
 	return (double_colon && chunks < 8) || (!double_colon && chunks == 8);
 }
 
-/* TODO 3.0.0: Add ipv6 check, too */
 gboolean
 purple_ip_address_is_valid(const char *ip)
 {
-	return purple_ipv4_address_is_valid(ip);
+	return (purple_ipv4_address_is_valid(ip) || purple_ipv6_address_is_valid(ip));
 }
 
 /* Stolen from gnome_uri_list_extract_uris */