pidgin.next.minor: b11b7c5a: Replace the URL registration assertions ...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: b11b7c5aba20eaaf2336abb41a3200cfb2d4fb15
Ancestor: 61948e1fee73116aa5b5d9a9eb01f524f462ae21
Author: rlaager at pidgin.im
Date: 2008-12-02T18:47:33
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/b11b7c5aba20eaaf2336abb41a3200cfb2d4fb15

Modified files:
        pidgin/gtkimhtml.c

ChangeLog: 

Replace the URL registration assertions with regular checks.

-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.c	33ccada9683c83d512d7e07c6e8b4574e8b31790
+++ pidgin/gtkimhtml.c	28819be7017cb8935c4445787953a0b8195d2191
@@ -5758,13 +5758,15 @@ gboolean gtk_imhtml_class_register_proto
 	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);