diff options
author | Alan Fitton <alan@eth0.org.uk> | 2012-07-15 18:18:21 +0100 |
---|---|---|
committer | Alan Fitton <alan@eth0.org.uk> | 2012-07-15 18:18:21 +0100 |
commit | 9ad29a5bee7d238fa33f8c2163acfbf6e7c541ab (patch) | |
tree | 380d26c08a580e5ffcb42cf0c27b0a7a4a8382af | |
parent | a2f0da7d7ff4c6ae7db689ff1c6c6bc3fc359b52 (diff) |
fix debug mode (used non-existent var in the model set). use the icons for queueing in the state selector in the torrent list icon too.
-rw-r--r-- | src/torrent.c | 4 | ||||
-rw-r--r-- | src/trg-torrent-model.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/torrent.c b/src/torrent.c index 0f2cc5e..e86cda8 100644 --- a/src/torrent.c +++ b/src/torrent.c @@ -302,6 +302,10 @@ gchar *torrent_get_status_icon(gint64 rpcv, guint flags) return g_strdup(GTK_STOCK_GO_UP); else if (flags & TORRENT_FLAG_CHECKING) return g_strdup(GTK_STOCK_REFRESH); + else if (flags & TORRENT_FLAG_DOWNLOADING_WAIT) + return g_strdup(GTK_STOCK_MEDIA_REWIND); + else if (flags & TORRENT_FLAG_SEEDING_WAIT) + return g_strdup(GTK_STOCK_MEDIA_FORWARD); else return g_strdup(GTK_STOCK_DIALOG_QUESTION); } diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c index 32fbbb5..bf0ae96 100644 --- a/src/trg-torrent-model.c +++ b/src/trg-torrent-model.c @@ -409,7 +409,7 @@ update_torrent_iter(TrgTorrentModel * model, JsonObject *lastJson, *pf; JsonArray *trackerStats; gchar *statusString, *statusIcon, *downloadDir; - gint64 downRate, upRate, haveValid, uploaded, id, status, lpd; + gint64 downRate, upRate, haveValid, uploaded, downloaded, id, status, lpd; gchar *firstTrackerHost = NULL; gchar *peerSources = NULL; gchar *lastDownloadDir = NULL; @@ -421,6 +421,7 @@ update_torrent_iter(TrgTorrentModel * model, stats->upRateTotal += upRate; uploaded = torrent_get_uploaded(t); + downloaded = torrent_get_downloaded(t); haveValid = torrent_get_have_valid(t); downloadDir = (gchar *) torrent_get_download_dir(t); @@ -487,7 +488,7 @@ update_torrent_iter(TrgTorrentModel * model, gtk_list_store_set(ls, iter, TORRENT_COLUMN_ETA, torrent_get_eta(t), -1); gtk_list_store_set(ls, iter, TORRENT_COLUMN_UPLOADED, uploaded, -1); - gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNLOADED, torrent_get_downloaded(t), + gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNLOADED, downloaded, -1); gtk_list_store_set(ls, iter, TORRENT_COLUMN_RATIO, uploaded > 0 && downloaded > @@ -549,7 +550,7 @@ update_torrent_iter(TrgTorrentModel * model, TORRENT_COLUMN_FLAGS, newFlags, TORRENT_COLUMN_UPSPEED, upRate, TORRENT_COLUMN_ETA, torrent_get_eta(t), TORRENT_COLUMN_UPLOADED, - uploaded, TORRENT_COLUMN_DOWNLOADED, torrent_get_downloaded(t), + uploaded, TORRENT_COLUMN_DOWNLOADED, downloaded, TORRENT_COLUMN_HAVE_VALID, haveValid, TORRENT_COLUMN_FROMPEX, peerfrom_get_pex(pf), TORRENT_COLUMN_FROMDHT, peerfrom_get_dht(pf), |