From 971107f767ae965c4ac8856a256c6ee1c39c1523 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 27 Dec 2007 18:56:54 +0000 Subject: [PATCH] safer version of r4348 --- gtk/tr_core.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gtk/tr_core.c b/gtk/tr_core.c index 59b65e0ed..8b9e1b8e4 100644 --- a/gtk/tr_core.c +++ b/gtk/tr_core.c @@ -185,9 +185,14 @@ compareByActivity( GtkTreeModel * model, gpointer user_data UNUSED ) { int i; + tr_torrent *ta, *tb; const tr_stat *sa, *sb; - gtk_tree_model_get( model, a, MC_STAT, &sa, -1 ); - gtk_tree_model_get( model, b, MC_STAT, &sb, -1 ); + + gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 ); + gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 ); + + sa = tr_torrentStatCached( ta ); + sb = tr_torrentStatCached( tb ); if(( i = compareDouble( sa->rateUpload + sa->rateDownload, sb->rateUpload + sb->rateDownload ) )) @@ -231,9 +236,12 @@ compareByProgress( GtkTreeModel * model, gpointer user_data UNUSED ) { int ret; + tr_torrent *ta, *tb; const tr_stat *sa, *sb; - gtk_tree_model_get( model, a, MC_STAT, &sa, -1 ); - gtk_tree_model_get( model, b, MC_STAT, &sb, -1 ); + gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 ); + gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 ); + sa = tr_torrentStatCached( ta ); + sb = tr_torrentStatCached( tb ); ret = compareDouble( sa->percentDone, sb->percentDone ); if( !ret ) ret = compareDouble( sa->ratio, sa->ratio ); @@ -246,10 +254,10 @@ compareByState( GtkTreeModel * model, GtkTreeIter * b, gpointer user_data UNUSED ) { - const tr_stat *sa, *sb; - gtk_tree_model_get( model, a, MC_STAT, &sa, -1 ); - gtk_tree_model_get( model, b, MC_STAT, &sb, -1 ); - return sa->status - sb->status; + tr_torrent *ta, *tb; + gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 ); + gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 ); + return tr_torrentStatCached(ta)->status - tr_torrentStatCached(tb)->status; } static int