# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1141681222 0
# Node ID 184d62658af236afb74e768a35a48d5e11674a2d
# Parent  0a3c968b07dc64b3bef560636726c14bc15597f7
[gaim-migrate @ 15785]
Cleanup the NULL checks in this function.

Resolves CID 67
Resolves CID 68
Resolves CID 69

committer: Tailor Script <tailor@pidgin.im>

diff -r 0a3c968b07dc -r 184d62658af2 src/gtkwhiteboard.c
--- a/src/gtkwhiteboard.c	Mon Mar 06 21:35:26 2006 +0000
+++ b/src/gtkwhiteboard.c	Mon Mar 06 21:40:22 2006 +0000
@@ -296,7 +296,10 @@
 void gaim_gtk_whiteboard_exit(GtkWidget *widget, gpointer data)
 {
 	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)data;
-	GaimWhiteboard *wb = gtkwb->wb;
+	GaimWhiteboard *wb;
+
+	g_return_if_fail(gtkwb != NULL);
+	wb = gtkwb->wb;
 
 	if(gtkwb->window && gtkwb->pixmap)
 	{
@@ -307,12 +310,8 @@
 	else
 		LocalShutdownRequest = FALSE;
 
-	if(gtkwb)
-	{
-		g_free(gtkwb);
-
-		wb->ui_data = NULL;
-	}
+	g_free(gtkwb);
+	wb->ui_data = NULL;
 
 	/* Destroy whiteboard core, if the local user exited the whiteboard window */
 	if(wb && LocalShutdownRequest)