diff -r 677fdf58193e -r 6ec0cdde84f1 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue Jul 24 19:59:47 2007 +0000
+++ b/pidgin/gtkutils.c	Tue Jul 24 20:26:06 2007 +0000
@@ -82,8 +82,8 @@
 void
 pidgin_set_toplevel(GtkWindow *new_toplevel)
 {
-	g_return_if_fail(toplevel != NULL);
-	g_return_if_fail(GTK_IS_WINDOW(toplevel));
+	/* If new_toplevel is not NULL, then it better be a GtkWindow */
+	g_return_if_fail(!(new_toplevel && !GTK_IS_WINDOW(new_toplevel)));
 
 	if (toplevel) {
 		g_object_weak_unref(G_OBJECT(toplevel), (GWeakNotify)toplevel_weak_notify, NULL);