# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1228243653 0
# Node ID f1d81412680185820d61a498ce6f8afc658307a5
# Parent  b01a7f17a2bba52d5d3a4d654729dc6283e6b1e2
Replace the URL registration assertions with regular checks.

diff -r b01a7f17a2bb -r f1d814126801 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Tue Dec 02 17:20:53 2008 +0000
+++ b/pidgin/gtkimhtml.c	Tue Dec 02 18:47:33 2008 +0000
@@ -5758,13 +5758,15 @@
 	g_return_val_if_fail(klass, FALSE);
 
 	if ((proto = imhtml_find_protocol(name, TRUE))) {
-		g_return_val_if_fail(!activate, FALSE);
+		if (activate) {
+			return FALSE;
+		}
 		g_free(proto->name);
 		g_free(proto);
 		klass->protocols = g_list_remove(klass->protocols, proto);
 		return TRUE;
-	} else {
-		g_return_val_if_fail(activate, FALSE);
+	} else if (!activate) {
+		return FALSE;
 	}
 
 	proto = g_new0(GtkIMHtmlProtocol, 1);