--- epiphany-2.14.1/embed/downloader-view.c	2006-03-05 15:50:40.000000000 -0500
+++ epiphany-2.14.1w/embed/downloader-view.c	2006-07-20 01:02:23.000000000 -0500
@@ -57,15 +57,13 @@
 	COL_PERCENT,
 	COL_IMAGE,
 	COL_FILE,
-	COL_REMAINING,
 	COL_DOWNLOAD_OBJECT
 };
 
 enum
 {
-	PROGRESS_COL_POS,
 	FILE_COL_POS,
-	REMAINING_COL_POS
+	PROGRESS_COL_POS
 };
 
 #define EPHY_DOWNLOADER_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_DOWNLOADER_VIEW, DownloaderViewPrivate))
@@ -315,11 +313,11 @@
 
 	if (hours > 0)
 	{
-		return g_strdup_printf (_("%u:%02u.%02u"), hours, mins, secs);
+		return g_strdup_printf (_("%u:%02u.%02u hours"), hours, mins, secs);
 	}
 	else
 	{
-		return g_strdup_printf (_("%02u.%02u"), mins, secs);
+		return g_strdup_printf (_("%02u.%02u minutes"), mins, secs);
 	}
 }
 
@@ -439,7 +437,7 @@
 	{
 		remaining = format_interval (remaining_secs);
 	}
-
+    
 	path = gtk_tree_row_reference_get_path (row_ref);
 	gtk_tree_model_get_iter (dv->priv->model, &iter, path);
 	gtk_list_store_set (GTK_LIST_STORE (dv->priv->model),
@@ -447,7 +445,6 @@
 			    COL_STATE, state,
 			    COL_PERCENT, percent,
 			    COL_FILE, file,
-			    COL_REMAINING, remaining,
 			    -1);
 	gtk_tree_path_free (path);
 
@@ -571,11 +568,33 @@
 	EphyDownloadState state;
 	const char *text = NULL;
 	int percent;
-
+	GValue val = {0, };
+	EphyDownload *download;
+    gint64 remaining_secs;
+    char *remaining;
+    
+    
 	gtk_tree_model_get (model, iter,
 			    COL_STATE, &state,
 			    COL_PERCENT, &percent,
+    //            COL_DOWNLOAD_OBJECT, &val,
 			    -1);
+    gtk_tree_model_get_value (model, iter, COL_DOWNLOAD_OBJECT, &val);
+
+    download = g_value_get_object(&val);
+
+    remaining_secs = ephy_download_get_remaining_time (download);
+
+    g_value_unset(&val);
+
+	if (remaining_secs < 0)
+	{
+		remaining = g_strdup (_("Unknown"));
+	}
+	else
+	{
+		remaining = format_interval (remaining_secs);
+	}
 
 	switch (state)
 	{
@@ -602,8 +621,14 @@
 		default:
 			g_return_if_reached ();
 	}
+    //We don't have a relevant state to give, so we add our fancy relative remaining time
+    if (!text) {
+        text = g_strdup_printf(Q_("About %s left"), remaining);
+    }
+    text = g_strdup_printf("%d %%\n %s", percent, text);
 
 	g_object_set (renderer, "text", text, "value", percent, NULL);
+    g_free(remaining);
 }
 
 static void
@@ -639,11 +664,12 @@
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)),
 				     GTK_SELECTION_BROWSE);
 
-	liststore = gtk_list_store_new (6,
+	//liststore = gtk_list_store_new (6,
+	liststore = gtk_list_store_new (5,
 					G_TYPE_INT,
 					G_TYPE_INT,
 					GDK_TYPE_PIXBUF,
-					G_TYPE_STRING,
+	//				G_TYPE_STRING,
 					G_TYPE_STRING,
 					G_TYPE_OBJECT);
 
@@ -681,22 +707,10 @@
 						     renderer,
 						     NULL);
 	column = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->treeview), PROGRESS_COL_POS);
-	gtk_tree_view_column_set_cell_data_func(column, renderer, progress_cell_data_func, NULL, NULL);
+    
+    gtk_tree_view_column_set_cell_data_func(column, renderer, progress_cell_data_func, NULL, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, COL_PERCENT);
 
-	/* Remainng time column */
-	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (renderer, "xalign", 0.5, NULL);
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(priv->treeview),
-						     REMAINING_COL_POS, _("Remaining"),
-						     renderer,
-						     "text", COL_REMAINING,
-						     NULL);
-
-	column = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->treeview),
-					   REMAINING_COL_POS);
-	gtk_tree_view_column_set_sort_column_id (column, COL_REMAINING);
-
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->treeview), FALSE);
 
 	priv->model = GTK_TREE_MODEL (liststore);
