Changeset 10381


Ignore:
Timestamp:
Mar 15, 2010, 3:10:54 AM (11 years ago)
Author:
charles
Message:

(trunk gtk) preserve the old filter's behavior of including torrents being verified in the "active" filter. Thanks to Waldorf for the reminder.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/filter.c

    r10380 r10381  
    437437    int type;
    438438    gtk_tree_model_get( tree_model, iter, CAT_FILTER_COL_TYPE, &type, -1 );
    439     g_object_set( cell_renderer, "width", type==CAT_FILTER_TYPE_HOST ? 16 : 0, NULL );
     439    g_object_set( cell_renderer, "width", type==CAT_FILTER_TYPE_HOST ? 20 : 0, NULL );
    440440}
    441441static void
     
    591591    STATE_FILTER_PAUSED,
    592592    STATE_FILTER_QUEUED,
    593     STATE_FILTER_CHECKING,
     593    STATE_FILTER_VERIFYING,
    594594    STATE_FILTER_ERROR,
    595595    STATE_FILTER_SEPARATOR
     
    626626
    627627        case STATE_FILTER_ACTIVE:
    628             return st->peersSendingToUs > 0 || st->peersGettingFromUs > 0;
     628            return ( st->peersSendingToUs > 0 )
     629                || ( st->peersGettingFromUs > 0 );
     630                || ( st->activity == TR_STATUS_CHECK );
    629631
    630632        case STATE_FILTER_PAUSED:
     
    634636            return FALSE;
    635637
    636         case STATE_FILTER_CHECKING:
     638        case STATE_FILTER_VERIFYING:
    637639            return ( st->activity == TR_STATUS_CHECK_WAIT )
    638640                || ( st->activity == TR_STATUS_CHECK );
     
    966968    data->filter_model = gtk_tree_model_filter_new( tmodel, NULL );
    967969
    968     g_object_set( G_OBJECT( data->category ), "width-request", 150, NULL );
     970    g_object_set( G_OBJECT( data->category ), "width-request", 170, NULL );
    969971    g_object_set_data( G_OBJECT( gtk_combo_box_get_model( GTK_COMBO_BOX( data->category ) ) ), SESSION_KEY, session );
    970972
Note: See TracChangeset for help on using the changeset viewer.