Changeset 4367
Legend:
- Unmodified
- Added
- Removed
-
trunk/gtk/main.c
r4363 r4367 160 160 161 161 static void 162 accumulateStatusForeach (GtkTreeModel * model,162 accumulateStatusForeach( GtkTreeModel * model, 163 163 GtkTreePath * path UNUSED, 164 164 GtkTreeIter * iter, … … 167 167 int status = 0; 168 168 struct counts_data * counts = user_data; 169 tr_torrent * tor;170 169 171 170 ++counts->totalCount; 172 171 173 gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 ); 174 status = tr_torrentStat( tor )->status; 172 gtk_tree_model_get( model, iter, MC_STATUS, &status, -1 ); 175 173 176 174 if( TR_STATUS_IS_ACTIVE( status ) ) … … 186 184 gpointer accumulated_status) 187 185 { 188 TrTorrent * gtor = NULL; 189 gtk_tree_model_get( model, iter, MC_TORRENT, >or, -1 ); 190 *(int*)accumulated_status |= 191 tr_torrentCanManualUpdate( tr_torrent_handle( gtor ) ); 192 g_object_unref( G_OBJECT( gtor ) ); 186 tr_torrent * tor; 187 gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 ); 188 *(int*)accumulated_status |= tr_torrentCanManualUpdate( tor ); 193 189 } 194 190 -
trunk/gtk/tr_core.c
r4365 r4367 255 255 gpointer user_data UNUSED ) 256 256 { 257 tr_torrent *ta, *tb;258 gtk_tree_model_get( model, a, MC_ TORRENT_RAW, &ta, -1 );259 gtk_tree_model_get( model, b, MC_ TORRENT_RAW, &tb, -1 );260 return tr_torrentStatCached(ta)->status - tr_torrentStatCached(tb)->status;257 int sa, sb; 258 gtk_tree_model_get( model, a, MC_STATUS, &sa, -1 ); 259 gtk_tree_model_get( model, b, MC_STATUS, &sb, -1 ); 260 return sa - sb; 261 261 } 262 262 … … 655 655 -1 ); 656 656 657 torStat = tr_torrent Stat( tr_torrent_handle( gtor ));657 torStat = tr_torrent_stat( gtor ); 658 658 659 659 if( oldStatus != (int) torStat->status )
Note: See TracChangeset
for help on using the changeset viewer.