Fix a DCC cancel crash.

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 10679)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+Thu Jun 29 11:02:22 BST 2006  Daniel Drake <dsd@gentoo.org>
+
+	* src/fe-gnome/dcc-window.c:
+	  - Fix DCC stop crasher and timeout handling bug
+
 Sun Jun 25 11:22:27 CEST 2006  David Trowbridge <trowbrds@gmail.com>
 
 	* src/fe-gnome/main-window.c:
Index: src/fe-gnome/dcc-window.c
===================================================================
--- src/fe-gnome/dcc-window.c	(revision 10679)
+++ src/fe-gnome/dcc-window.c	(working copy)
@@ -71,9 +71,8 @@
 		return;
 
 	gtk_tree_model_get (model, &iter, DCC_COLUMN, &dcc, -1);
+	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 	dcc_abort (dcc->serv->server_session, dcc);
-
-	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 }
 
 static void
@@ -307,6 +306,8 @@
 				} else if (dcc->dccstat == 3) {
 					gtk_list_store_remove (window->transfer_store, &iter);
 					return;
+				} else if (dcc->dccstat == 5) {
+					remaining_text = g_strdup (_("aborted"));
 				} else {
 					if (dcc->cps == 0) {
 						remaining_text = g_strdup (_("stalled"));
@@ -332,7 +333,7 @@
 				/* We put off rendering the icon until we get at least one update,
 				 * to ensure that gnome-vfs can determine the MIME type
 				 */
-				if (icon == NULL) {
+				if (dcc->destfile != NULL && icon == NULL) {
 					GtkIconTheme *icon_theme;
 					char *icon;
 					char *mime;