libpurple/util.c

branch
soc.2013.gobjectification.plugins
changeset 36630
ff356949df25
parent 36626
18fc361b3704
child 36637
9b0109ae118d
--- a/libpurple/util.c	Sun Sep 01 01:41:50 2013 +0530
+++ b/libpurple/util.c	Sun Sep 01 02:28:54 2013 +0530
@@ -3392,7 +3392,7 @@
 		PurpleProtocol *protocol =
 				purple_protocols_find(purple_account_get_protocol_id(account));
 
-		if (protocol != NULL && protocol->normalize)
+		if (protocol != NULL)
 			ret = purple_protocol_iface_normalize(protocol, account, str);
 	}
 
@@ -3443,10 +3443,11 @@
 	if (str[0] == '\0')
 		return FALSE;
 
-	if (!protocol->normalize)
+	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, normalize))
 		return TRUE;
 
-	normalized = purple_protocol_iface_normalize(protocol, NULL, str);
+	normalized = purple_protocol_iface_normalize(PURPLE_PROTOCOL(protocol),
+			NULL, str);
 
 	return (NULL != normalized);
 }

mercurial