[Gaim-commits] CVS: gaim/src dialogs.c,1.554,1.555

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23714/src

Modified Files:
	dialogs.c 
Log Message:
ok, now it works, but doesn't close the window or clear the contents of it.

that won't keep me up nights.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -d -p -r1.554 -r1.555
--- dialogs.c	30 Oct 2003 06:49:41 -0000	1.554
+++ dialogs.c	30 Oct 2003 07:00:11 -0000	1.555
@@ -1969,23 +1969,27 @@ static void do_clear_log_file(struct vie
 
 	g_free(filename);
 
-	gtk_widget_destroy(view->window);
+	if(view)
+		gtk_widget_destroy(view->window);
 }
 
 static void show_clear_log(GtkWidget *w, struct view_log *view)
 {
 	char *text;
+	void *clear_handle;
 
 	if ((view != NULL ) && (view->clear_handle != NULL))
 		return;
 
 	text = g_strdup_printf(_("You are about to remove the log file for %s.  Do you want to continue?"),
 						   view ? view->name : _("System Log"));
-	view->clear_handle = gaim_request_action(NULL, NULL, _("Remove Log"),
+	clear_handle = gaim_request_action(NULL, NULL, _("Remove Log"),
 											 text, -1, view, 2,
 											 _("Remove Log"),
 											 G_CALLBACK(do_clear_log_file),
 											 _("Cancel"), NULL);
+	if(view)
+		view->clear_handle = clear_handle;
 	g_free(text);
 }