Changeset 9171


Ignore:
Timestamp:
Sep 25, 2009, 10:18:54 PM (13 years ago)
Author:
livings124
Message:

fix mac build - tracker info tab info is not fully available for now

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Transmission.xcodeproj/project.pbxproj

    r9157 r9171  
    126126                A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* TransmissionHelp */; };
    127127                A25963E11068376200453B31 /* FavIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = A25963E01068376200453B31 /* FavIcon.png */; };
     128                A25964A6106D73A800453B31 /* announcer.c in Sources */ = {isa = PBXBuildFile; fileRef = A25964A4106D73A800453B31 /* announcer.c */; };
     129                A25964A7106D73A800453B31 /* announcer.h in Headers */ = {isa = PBXBuildFile; fileRef = A25964A5106D73A800453B31 /* announcer.h */; };
    128130                A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */ = {isa = PBXBuildFile; fileRef = A25D2CBB0CF4C7190096A262 /* stats.c */; };
    129131                A25D2CBE0CF4C73E0096A262 /* stats.h in Headers */ = {isa = PBXBuildFile; fileRef = A25D2CBA0CF4C7190096A262 /* stats.h */; };
    … …  
    277279                BEFC1E2E0C07861A00B0BB3C /* transmission.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF50C07861A00B0BB3C /* transmission.h */; };
    278280                BEFC1E2F0C07861A00B0BB3C /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF60C07861A00B0BB3C /* session.c */; };
    279                 BEFC1E300C07861A00B0BB3C /* tracker.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF70C07861A00B0BB3C /* tracker.h */; };
    280                 BEFC1E310C07861A00B0BB3C /* tracker.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF80C07861A00B0BB3C /* tracker.c */; };
    281281                BEFC1E320C07861A00B0BB3C /* torrent.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1DF90C07861A00B0BB3C /* torrent.c */; };
    282282                BEFC1E350C07861A00B0BB3C /* port-forwarding.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */; };
    … …  
    554554                A259316A0A73B2CC002F4FE7 /* TransmissionHelp */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TransmissionHelp; path = macosx/TransmissionHelp; sourceTree = "<group>"; };
    555555                A25963E01068376200453B31 /* FavIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FavIcon.png; path = macosx/Images/FavIcon.png; sourceTree = "<group>"; };
     556                A25964A4106D73A800453B31 /* announcer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = announcer.c; path = libtransmission/announcer.c; sourceTree = "<group>"; };
     557                A25964A5106D73A800453B31 /* announcer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = announcer.h; path = libtransmission/announcer.h; sourceTree = "<group>"; };
    556558                A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = "<group>"; };
    557559                A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = "<group>"; };
    … …  
    772774                BEFC1DF50C07861A00B0BB3C /* transmission.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = transmission.h; path = libtransmission/transmission.h; sourceTree = "<group>"; };
    773775                BEFC1DF60C07861A00B0BB3C /* session.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = session.c; path = libtransmission/session.c; sourceTree = "<group>"; };
    774                 BEFC1DF70C07861A00B0BB3C /* tracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tracker.h; path = libtransmission/tracker.h; sourceTree = "<group>"; };
    775                 BEFC1DF80C07861A00B0BB3C /* tracker.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tracker.c; path = libtransmission/tracker.c; sourceTree = "<group>"; };
    776776                BEFC1DF90C07861A00B0BB3C /* torrent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = torrent.c; path = libtransmission/torrent.c; sourceTree = "<group>"; };
    777777                BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "port-forwarding.h"; path = "libtransmission/port-forwarding.h"; sourceTree = "<group>"; };
    … …  
    11761176                                BEFC1E140C07861A00B0BB3C /* session.h */,
    11771177                                A20152790D1C26EB0081714F /* torrent-ctor.c */,
    1178                                 BEFC1DF70C07861A00B0BB3C /* tracker.h */,
    1179                                 BEFC1DF80C07861A00B0BB3C /* tracker.c */,
     1178                                A25964A4106D73A800453B31 /* announcer.c */,
     1179                                A25964A5106D73A800453B31 /* announcer.h */,
    11801180                                BEFC1DF90C07861A00B0BB3C /* torrent.c */,
    11811181                                BEFC1DFC0C07861A00B0BB3C /* port-forwarding.h */,
    … …  
    14291429                                A2AAB65E0DE0CF6200E04DDA /* rpc-server.h in Headers */,
    14301430                                BEFC1E2E0C07861A00B0BB3C /* transmission.h in Headers */,
    1431                                 BEFC1E300C07861A00B0BB3C /* tracker.h in Headers */,
    14321431                                BEFC1E350C07861A00B0BB3C /* port-forwarding.h in Headers */,
    14331432                                BEFC1E390C07861A00B0BB3C /* ratecontrol.h in Headers */,
    … …  
    14681467                                A22CFCA90FC24ED80009BD3E /* tr-dht.h in Headers */,
    14691468                                0A6169A80FE5C9A200C66CE6 /* bitfield.h in Headers */,
     1469                                A25964A7106D73A800453B31 /* announcer.h in Headers */,
    14701470                        );
    14711471                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    18841884                                A2AAB65C0DE0CF6200E04DDA /* rpc-server.c in Sources */,
    18851885                                BEFC1E2F0C07861A00B0BB3C /* session.c in Sources */,
    1886                                 BEFC1E310C07861A00B0BB3C /* tracker.c in Sources */,
    18871886                                BEFC1E320C07861A00B0BB3C /* torrent.c in Sources */,
    18881887                                BEFC1E360C07861A00B0BB3C /* port-forwarding.c in Sources */,
    … …  
    19251924                                A22CFCA80FC24ED80009BD3E /* tr-dht.c in Sources */,
    19261925                                0A6169A70FE5C9A200C66CE6 /* bitfield.c in Sources */,
     1926                                A25964A6106D73A800453B31 /* announcer.c in Sources */,
    19271927                        );
    19281928                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/macosx/Controller.m

    r9163 r9171  
    20242024            if (filterTracker)
    20252025            {
    2026                 BOOL removeTextField = YES;
     2026                #warning fix!
     2027                /*BOOL removeTextField = YES;
    20272028                for (NSString * tracker in [torrent allTrackers: NO])
    20282029                {
    … …  
    20352036               
    20362037                if (removeTextField)
    2037                     continue;
     2038                    continue;*/
    20382039            }
    20392040            else

  • trunk/macosx/InfoWindowController.m

    r9168 r9171  
    490490        //get trackers for table
    491491        [fTrackers release];
     492        #warning fix!
    492493        fTrackers = [[torrent allTrackers: YES] retain];
    493494        [fTrackerTable deselectAll: self];
    … …  
    11321133}
    11331134
     1135#warning fix!
    11341136- (void) tableView: (NSTableView *) tableView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn
    11351137    row: (NSInteger) row
    … …  
    14171419    Torrent * torrent = [fTorrents objectAtIndex: 0];
    14181420   
    1419     [fTrackerField setStringValue: [torrent trackerAddressAnnounce]];
     1421    #warning fix!
     1422    //[fTrackerField setStringValue: [torrent trackerAddressAnnounce]];
    14201423   
    14211424    NSString * location = [torrent dataLocation];
    … …  
    14971500
    14981501#warning reload table when necessary?
     1502#warning fix!
    14991503- (void) updateInfoTracker
    15001504{
    1501     if ([fTorrents count] != 1)
     1505    /*if ([fTorrents count] != 1)
    15021506        return;
    15031507    Torrent * torrent = [fTorrents objectAtIndex: 0];
    … …  
    15631567            scrapeNextString = [NSString timeString: scrapeNext showSeconds: YES];
    15641568    }
    1565     [fScrapeNextField setStringValue: scrapeNextString];
     1569    [fScrapeNextField setStringValue: scrapeNextString];*/
    15661570}
    15671571
    … …  
    18861890    [fTrackers removeObjectsAtIndexes: indexes];
    18871891   
     1892    #warning fix!
    18881893    Torrent * torrent = [fTorrents objectAtIndex: 0];
    18891894    [torrent updateAllTrackersForRemove: fTrackers];

  • trunk/macosx/Torrent.h

    r9125 r9171  
    132132- (uint64_t) sizeLeft;
    133133
    134 - (NSString *) trackerAddressAnnounce;
     134/*- (NSString *) trackerAddressAnnounce;
    135135- (NSDate *) lastAnnounceTime;
    136136- (NSInteger) nextAnnounceTime;
    … …  
    140140- (NSDate *) lastScrapeTime;
    141141- (NSInteger) nextScrapeTime;
    142 - (NSString *) scrapeResponse;
     142- (NSString *) scrapeResponse;*/
    143143
    144144- (NSMutableArray *) allTrackers: (BOOL) separators;

  • trunk/macosx/Torrent.m

    r9127 r9171  
    672672}
    673673
    674 - (NSString *) trackerAddressAnnounce
    675 {
    676     return fStat->announceURL ? [NSString stringWithUTF8String: fStat->announceURL] : nil;
     674/*- (NSString *) trackerAddressAnnounce
     675{
     676#warning fix
     677    return @"fix me!";
     678    //return fStat->announceURL ? [NSString stringWithUTF8String: fStat->announceURL] : nil;
    677679}
    678680
    … …  
    706708- (NSString *) trackerAddressScrape
    707709{
    708     return fStat->scrapeURL ? [NSString stringWithUTF8String: fStat->scrapeURL] : nil;
     710#warning fix
     711    return @"fix me!";
     712    //return fStat->scrapeURL ? [NSString stringWithUTF8String: fStat->scrapeURL] : nil;
    709713}
    710714
    … …  
    734738{
    735739    return [NSString stringWithUTF8String: fStat->scrapeResponse];
    736 }
     740}*/
    737741
    738742- (NSMutableArray *) allTrackers: (BOOL) separators
Note: See TracChangeset for help on using the changeset viewer.