diff src/gtkconv.c @ 4369:7e1fb422e5fd

[gaim-migrate @ 4635] Fixes a couple crash bugs. We're getting there! committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Mon Jan 20 21:54:46 2003 +0000
+++ b/src/gtkconv.c	Mon Jan 20 22:39:39 2003 +0000
@@ -1650,8 +1650,7 @@
 
 	dnd_hints_hide_all();
 
-	dest_win    = gaim_gtkwin_get_at_xy(e->x_root, e->y_root);
-	dest_gtkwin = GAIM_GTK_WINDOW(dest_win);
+	dest_win = gaim_gtkwin_get_at_xy(e->x_root, e->y_root);
 
 	conv = gaim_window_get_active_conversation(win);
 
@@ -1673,6 +1672,8 @@
 		return TRUE;
 	}
 
+	dest_gtkwin = GAIM_GTK_WINDOW(dest_win);
+
 	/* Get the destination notebook. */
 	dest_notebook = GTK_NOTEBOOK(gtkwin->notebook);
 
@@ -3228,8 +3229,12 @@
 {
 	struct gaim_gtk_window *gtkwin = GAIM_GTK_WINDOW(win);
 
+	gaim_gtk_set_state_lock(TRUE);
+
 	gtk_widget_destroy(gtkwin->window);
 
+	gaim_gtk_set_state_lock(FALSE);
+
 	g_free(gtkwin);
 	win->ui_data = NULL;
 }