Changeset 525 for trunk/gtk/main.c

Timestamp:

Jul 4, 2006, 10:31:14 PM (16 years ago)

Author:

joshe

Message:

Move the ETA cap of 99:59:59 from libtransmission to the MacOS X GUI.
Display the ETA better in the GTK GUI.

File:

• trunk/gtk/main.c (modified) (2 diffs)

trunk/gtk/main.c

@@ -679 +679 @@
 dfname(GtkTreeViewColumn *col SHUTUP, GtkCellRenderer *rend,
        GtkTreeModel *model, GtkTreeIter *iter, gpointer gdata SHUTUP) {
-  char *name, *mb, *terr, *str, *top, *bottom;
+  char *name, *mb, *terr, *str, *top, *bottom, *timestr;
   guint64 size;
   gfloat prog;
@@ -701 +701 @@
   else if(status & TR_STATUS_DOWNLOAD) {
     if(0 > eta)
-      top = g_strdup_printf(_("Finishing in --:--:-- (%.1f%%)"), prog);
-    else
-      top = g_strdup_printf(_("Finishing in %02i:%02i:%02i (%.1f%%)"),
-                            eta / 60 / 60, eta / 60 % 60, eta % 60, prog);
+      top = g_strdup_printf(_("Stalled (%.1f%%)"), prog);
+    else {
+      timestr = readabletime(eta);
+      top = g_strdup_printf(_("Finishing in %s (%.1f%%)"), timestr, prog);
+      g_free(timestr);
+    }
   }
   else if(status & TR_STATUS_SEED)