Changeset 5457


Ignore:
Timestamp:
Mar 31, 2008, 5:59:16 PM (14 years ago)
Author:
charles
Message:

remove `TR_STATUS_DONE' from libtransmission's public API. It's useful as an internal state but not for code calling libtransmission.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/beos/TRTransfer.cpp

    r4182 r5457  
    2121 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2222 *
    23  * $Id:$
     23 * $Id$
    2424 */
    2525
     
    155155                        sprintf(fTimeStr, "Checking Existing Files (%.2f %%)",
    156156                                100 * fStatus->percentDone);
    157                 } else if (fStatus->status & TR_STATUS_DONE ) {
    158                         sprintf(fTimeStr, "Done...");
    159157                } else if (fStatus->status & TR_STATUS_DOWNLOAD) {
    160158                        if (fStatus->eta < 0 ) {
  • trunk/gtk/torrent-cell-renderer.c

    r5313 r5457  
    150150
    151151        case TR_STATUS_DOWNLOAD:
    152         case TR_STATUS_SEED:
    153         case TR_STATUS_DONE: {
     152        case TR_STATUS_SEED: {
    154153            char buf[128];
    155154            if( torStat->status != TR_STATUS_DOWNLOAD ) {
     
    203202            break;
    204203
    205         case TR_STATUS_DONE:
    206204        case TR_STATUS_SEED:
    207205            g_string_append_printf( gstr,
  • trunk/gtk/tr-torrent.c

    r5329 r5457  
    296296            break;
    297297
    298         case TR_STATUS_DONE:
    299             top = g_strdup_printf(
    300                 ngettext( "Uploading to %1$'d of %2$'d connected peer",
    301                           "Uploading to %1$'d of %2$'d connected peers", tpeers ),
    302                           upeers, tpeers );
    303             break;
    304 
    305298        case TR_STATUS_SEED:
    306299            top = g_strdup_printf(
  • trunk/gtk/tr-window.c

    r5329 r5457  
    317317            break;
    318318        case FILTER_MODE_SEEDING:
    319             ret =    ( torStat->status == TR_STATUS_DONE )
    320                   || ( torStat->status == TR_STATUS_SEED );
     319            ret = torStat->status == TR_STATUS_SEED;
    321320            break;
    322321        case FILTER_MODE_PAUSED:
  • trunk/libtransmission/ipcparse.c

    r5329 r5457  
    786786                    tr_bencInitStr( item, "downloading", -1, 1 );
    787787                }
    788                 else if( ( TR_STATUS_DONE | TR_STATUS_SEED ) & st->status )
     788                else if( TR_STATUS_SEED & st->status )
    789789                {
    790790                    tr_bencInitStr( item, "seeding", -1, 1 );
  • trunk/libtransmission/torrent.c

    r5357 r5457  
    606606    else if( tor->cpStatus == TR_CP_INCOMPLETE )
    607607        s->status = TR_STATUS_DOWNLOAD;
    608     else if( tor->cpStatus == TR_CP_DONE )
    609         s->status = TR_STATUS_DONE;
    610608    else
    611609        s->status = TR_STATUS_SEED;
  • trunk/libtransmission/transmission.h

    r5438 r5457  
    735735    TR_STATUS_CHECK        = (1<<1), /* Checking files */
    736736    TR_STATUS_DOWNLOAD     = (1<<2), /* Downloading */
    737     TR_STATUS_DONE         = (1<<3), /* not at 100% so can't tell the tracker
    738                                         we're a seeder, but due to DND files
    739                                         there's nothing we want right now */
    740     TR_STATUS_SEED         = (1<<4), /* Seeding */
    741     TR_STATUS_STOPPED      = (1<<5)  /* Torrent is stopped */
     737    TR_STATUS_SEED         = (1<<3), /* Seeding */
     738    TR_STATUS_STOPPED      = (1<<4)  /* Torrent is stopped */
    742739}
    743740tr_torrent_status;
  • trunk/macosx/Torrent.m

    r5452 r5457  
    891891- (BOOL) isSeeding
    892892{
    893     return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
     893    return fStat->status == TR_STATUS_SEED;
    894894}
    895895
     
    10591059
    10601060            case TR_STATUS_SEED:
    1061             case TR_STATUS_DONE:
    10621061                if ([self totalPeersConnected] != 1)
    10631062                    string = [NSString stringWithFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"),
     
    11261125       
    11271126        case TR_STATUS_SEED:
    1128         case TR_STATUS_DONE:
    11291127            string = [NSString stringWithFormat: @"%@: %@, %@: %@",
    11301128                            NSLocalizedString(@"Ratio", "Torrent -> status string"), [NSString stringForRatio: [self ratio]],
     
    11681166
    11691167        case TR_STATUS_SEED:
    1170         case TR_STATUS_DONE:
    11711168            return NSLocalizedString(@"Seeding", "Torrent -> status string");
    11721169       
  • trunk/wx/filter.cc

    r4494 r5457  
    3434            break;
    3535
    36         case TR_STATUS_DONE:
    3736        case TR_STATUS_SEED:
    3837            flags |= FLAG_SEEDING;
  • trunk/wx/torrent-list.cc

    r4494 r5457  
    308308                    case TR_STATUS_CHECK_WAIT:  xstr = _("Waiting to Check"); break;
    309309                    case TR_STATUS_DOWNLOAD:    xstr = _("Downloading"); break;
    310                     case TR_STATUS_DONE:
    311310                    case TR_STATUS_SEED:        xstr = _("Seeding"); break;
    312311                    default: assert( 0 );
Note: See TracChangeset for help on using the changeset viewer.