mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

get xcode project building again

This commit is contained in:
Mitchell Livingston 2007-09-20 20:24:33 +00:00
parent fb70a9cca0
commit f0b968d7b7
16 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Transmission.xcodeproj/project.pbxproj
View File

@ -32,6 +32,7 @@
4D36BA7A0CA2F00800A63CA5 /* peer-msgs.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D36BA6B0CA2F00800A63CA5 /* peer-msgs.h */; };
4D36BA7B0CA2F00800A63CA5 /* ptrarray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D36BA6C0CA2F00800A63CA5 /* ptrarray.h */; };
4D36BA7C0CA2F00800A63CA5 /* publish.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D36BA6D0CA2F00800A63CA5 /* publish.h */; };
4D36BBC90CA309AA00A63CA5 /* evutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D36BBC80CA309AA00A63CA5 /* evutil.c */; };
4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; };
4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };
4D6DAAC6090CE00500F43C22 /* RevealOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D6DAAC4090CE00500F43C22 /* RevealOff.png */; };
@ -323,6 +324,7 @@
4D36BA6B0CA2F00800A63CA5 /* peer-msgs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "peer-msgs.h"; path = "libtransmission/peer-msgs.h"; sourceTree = "<group>"; };
4D36BA6C0CA2F00800A63CA5 /* ptrarray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ptrarray.h; path = libtransmission/ptrarray.h; sourceTree = "<group>"; };
4D36BA6D0CA2F00800A63CA5 /* publish.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = publish.h; path = libtransmission/publish.h; sourceTree = "<group>"; };
4D36BBC80CA309AA00A63CA5 /* evutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = evutil.c; path = "third-party/libevent/evutil.c"; sourceTree = "<group>"; };
4D3EA0A908AE13C600EA10C2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
4D6DAAC4090CE00500F43C22 /* RevealOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOff.png; path = macosx/Images/RevealOff.png; sourceTree = "<group>"; };
4D6DAAC5090CE00500F43C22 /* RevealOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOn.png; path = macosx/Images/RevealOn.png; sourceTree = "<group>"; };
@ -353,7 +355,7 @@
4DFBC2DD09C0970D00D5C571 /* Torrent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Torrent.h; path = macosx/Torrent.h; sourceTree = "<group>"; };
4DFBC2DE09C0970D00D5C571 /* Torrent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Torrent.m; path = macosx/Torrent.m; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = Info.plist; path = macosx/Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
A200B8390A2263BA007BBB1E /* InfoWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoWindowController.h; path = macosx/InfoWindowController.h; sourceTree = "<group>"; };
A200B83A0A2263BA007BBB1E /* InfoWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoWindowController.m; path = macosx/InfoWindowController.m; sourceTree = "<group>"; };
A200B9630A227FD0007BBB1E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = "<group>"; };
@ -949,6 +951,7 @@
BE75C3570C72A0D600DBEFE0 /* libevent */ = {
isa = PBXGroup;
children = (
4D36BBC80CA309AA00A63CA5 /* evutil.c */,
BE75C3810C72A1C100DBEFE0 /* evhttp.h */,
BE75C3820C72A1C100DBEFE0 /* evdns.h */,
BE75C3830C72A1C100DBEFE0 /* evrpc.h */,
@ -1497,6 +1500,7 @@
BE75C36F0C72A0EF00DBEFE0 /* evdns.c in Sources */,
BE75C3700C72A0EF00DBEFE0 /* poll.c in Sources */,
BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */,
4D36BBC90CA309AA00A63CA5 /* evutil.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

4
macosx/Badger.h
View File

@ -30,7 +30,7 @@
@interface Badger : NSObject
{
tr_handle_t * fLib;
tr_handle * fLib;
NSImage * fDockIcon, * fBadge, * fUploadBadge, * fDownloadBadge;
NSDictionary * fAttributes;
@ -38,7 +38,7 @@
BOOL fSpeedBadge;
}
- (id) initWithLib: (tr_handle_t *) lib;
- (id) initWithLib: (tr_handle *) lib;
- (void) updateBadge;
- (void) incrementCompleted;

2
macosx/Badger.m
View File

@ -33,7 +33,7 @@
@implementation Badger
- (id) initWithLib: (tr_handle_t *) lib
- (id) initWithLib: (tr_handle *) lib
{
if ((self = [super init]))
{

2
macosx/Controller.h
View File

@ -42,7 +42,7 @@
@interface Controller : NSObject <GrowlApplicationBridgeDelegate>
{
tr_handle_t * fLib;
tr_handle * fLib;
NSMutableArray * fTorrents, * fDisplayedTorrents;

4
macosx/Controller.m
View File

@ -770,7 +770,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
Torrent * torrent;
NSString * torrentPath;
tr_info_t info;
tr_info info;
NSEnumerator * enumerator = [filenames objectEnumerator];
while ((torrentPath = [enumerator nextObject]))
{
@ -848,7 +848,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
//determine the next file that can be opened
NSString * torrentPath;
int canAdd;
tr_info_t info;
tr_info info;
while ([files count] > 0)
{
torrentPath = [[files objectAtIndex: 0] retain];

8
macosx/CreatorWindowController.h
View File

@ -36,7 +36,7 @@
IBOutlet NSView * fProgressView;
IBOutlet NSProgressIndicator * fProgressIndicator;
tr_metainfo_builder_t * fInfo;
tr_metainfo_builder * fInfo;
NSString * fPath, * fLocation;
BOOL fOpenTorrent;
@ -46,10 +46,10 @@
NSUserDefaults * fDefaults;
}
+ (void) createTorrentFile: (tr_handle_t *) handle;
+ (void) createTorrentFile: (tr_handle_t *) handle forFile: (NSString *) file;
+ (void) createTorrentFile: (tr_handle *) handle;
+ (void) createTorrentFile: (tr_handle *) handle forFile: (NSString *) file;
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path;
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle *) handle path: (NSString *) path;
- (void) setLocation: (id) sender;
- (void) create: (id) sender;

6
macosx/CreatorWindowController.m
View File

@ -36,7 +36,7 @@
@implementation CreatorWindowController
+ (void) createTorrentFile: (tr_handle_t *) handle
+ (void) createTorrentFile: (tr_handle *) handle
{
//get file/folder for torrent
NSString * path;
@ -47,13 +47,13 @@
[creator showWindow: nil];
}
+ (void) createTorrentFile: (tr_handle_t *) handle forFile: (NSString *) file
+ (void) createTorrentFile: (tr_handle *) handle forFile: (NSString *) file
{
CreatorWindowController * creator = [[self alloc] initWithWindowNibName: @"Creator" handle: handle path: file];
[creator showWindow: nil];
}
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle *) handle path: (NSString *) path
{
if ((self = [super initWithWindowNibName: name]))
{

4
macosx/DragOverlayWindow.h
View File

@ -27,12 +27,12 @@
@interface DragOverlayWindow : NSWindow
{
tr_handle_t * fLib;
tr_handle * fLib;
NSViewAnimation * fFadeInAnimation, * fFadeOutAnimation;
}
- (id) initWithLib: (tr_handle_t *) lib forWindow: (NSWindow *) window;
- (id) initWithLib: (tr_handle *) lib forWindow: (NSWindow *) window;
- (void) setTorrents: (NSArray *) files;
- (void) setFile: (NSString *) file;

4
macosx/DragOverlayWindow.m
View File

@ -28,7 +28,7 @@
@implementation DragOverlayWindow
- (id) initWithLib: (tr_handle_t *) lib forWindow: (NSWindow *) window
- (id) initWithLib: (tr_handle *) lib forWindow: (NSWindow *) window
{
if (self = ([super initWithContentRect: NSMakeRect(0, 0, 1.0, 1.0) styleMask: NSBorderlessWindowMask
backing: NSBackingStoreBuffered defer: NO]))
@ -82,7 +82,7 @@
NSString * file;
NSEnumerator * enumerator = [files objectEnumerator];
tr_info_t info;
tr_info info;
while ((file = [enumerator nextObject]))
{
if (tr_torrentParse(fLib, [file UTF8String], NULL, &info) == TR_OK)

2
macosx/MessageWindowController.m
View File

@ -101,7 +101,7 @@
- (void) updateLog: (NSTimer *) timer
{
tr_msg_list_t * messages, * currentMessage;
tr_msg_list * messages, * currentMessage;
if ((messages = tr_getQueuedMessages()) == NULL)
return;

4
macosx/PrefsController.h
View File

@ -29,7 +29,7 @@
@interface PrefsController : NSWindowController
{
tr_handle_t * fHandle;
tr_handle * fHandle;
NSUserDefaults * fDefaults;
BOOL fHasLoaded;
@ -53,7 +53,7 @@
int fPublicPort, fNatStatus;
}
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle;
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle *) handle;
- (void) setUpdater: (SUUpdater *) updater;
- (void) setPort: (id) sender;

4
macosx/PrefsController.m
View File

@ -49,7 +49,7 @@
@implementation PrefsController
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle
- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle *) handle
{
if ((self = [self initWithWindowNibName: name]))
{
@ -238,7 +238,7 @@
- (void) updatePortStatus
{
tr_handle_status_t * stat = tr_handleStatus(fHandle);
tr_handle_status * stat = tr_handleStatus(fHandle);
BOOL change;
if (change = (fNatStatus != stat->natTraversalStatus))

18
macosx/Torrent.h
View File

@ -36,10 +36,10 @@ typedef enum
@interface Torrent : NSObject
{
tr_handle_t * fLib;
tr_torrent_t * fHandle;
const tr_info_t * fInfo;
const tr_stat_t * fStat;
tr_handle * fLib;
tr_torrent * fHandle;
const tr_info * fInfo;
const tr_stat * fStat;
int fID;
@ -59,7 +59,7 @@ typedef enum
NSImage * fIcon;
NSString * fProgressString, * fStatusString, * fShortStatusString, * fRemainingTimeString;
tr_file_stat_t * fileStat;
tr_file_stat * fileStat;
NSArray * fFileList, * fFlatFileList;
NSMenu * fFileMenu;
@ -74,8 +74,8 @@ typedef enum
}
- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (torrentFileState) torrentDelete
lib: (tr_handle_t *) lib;
- (id) initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib;
lib: (tr_handle *) lib;
- (id) initWithHistory: (NSDictionary *) history lib: (tr_handle *) lib;
- (NSDictionary *) history;
@ -227,7 +227,7 @@ typedef enum
- (NSNumber *) ratioSortKey;
- (int) torrentID;
- (const tr_info_t *) torrentInfo;
- (const tr_stat_t *) torrentStat;
- (const tr_info *) torrentInfo;
- (const tr_stat *) torrentStat;
@end

20
macosx/Torrent.m
View File

@ -29,7 +29,7 @@ static int static_lastid = 0;
@interface Torrent (Private)
- (id) initWithHash: (NSString *) hashString path: (NSString *) path lib: (tr_handle_t *) lib
- (id) initWithHash: (NSString *) hashString path: (NSString *) path lib: (tr_handle *) lib
publicTorrent: (NSNumber *) publicTorrent
downloadFolder: (NSString *) downloadFolder
useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
@ -57,7 +57,7 @@ static int static_lastid = 0;
@implementation Torrent
- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (torrentFileState) torrentDelete
lib: (tr_handle_t *) lib
lib: (tr_handle *) lib
{
self = [self initWithHash: nil path: path lib: lib
publicTorrent: torrentDelete != TORRENT_FILE_DEFAULT
@ -78,7 +78,7 @@ static int static_lastid = 0;
return self;
}
- (id) initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib
- (id) initWithHistory: (NSDictionary *) history lib: (tr_handle *) lib
{
self = [self initWithHash: [history objectForKey: @"TorrentHash"]
path: [history objectForKey: @"TorrentPath"] lib: lib
@ -1014,12 +1014,12 @@ static int static_lastid = 0;
- (NSArray *) peers
{
int totalPeers, i;
tr_peer_stat_t * peers = tr_torrentPeers(fHandle, &totalPeers);
tr_peer_stat * peers = tr_torrentPeers(fHandle, &totalPeers);
NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers];
NSMutableDictionary * dic;
tr_peer_stat_t * peer;
tr_peer_stat * peer;
for (i = 0; i < totalPeers; i++)
{
peer = &peers[i];
@ -1396,12 +1396,12 @@ static int static_lastid = 0;
return fID;
}
- (const tr_info_t *) torrentInfo
- (const tr_info *) torrentInfo
{
return fInfo;
}
- (const tr_stat_t *) torrentStat
- (const tr_stat *) torrentStat
{
return fStat;
}
@ -1411,7 +1411,7 @@ static int static_lastid = 0;
@implementation Torrent (Private)
//if a hash is given, attempt to load that; otherwise, attempt to open file at path
- (id) initWithHash: (NSString *) hashString path: (NSString *) path lib: (tr_handle_t *) lib
- (id) initWithHash: (NSString *) hashString path: (NSString *) path lib: (tr_handle *) lib
publicTorrent: (NSNumber *) publicTorrent
downloadFolder: (NSString *) downloadFolder
useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
@ -1446,7 +1446,7 @@ static int static_lastid = 0;
}
NSString * currentDownloadFolder;
tr_info_t info;
tr_info info;
int error;
if (hashString)
{
@ -1507,7 +1507,7 @@ static int static_lastid = 0;
- (void) createFileList
{
int count = [self fileCount], i;
tr_file_t * file;
tr_file * file;
NSMutableArray * pathComponents;
NSString * path;

4
macosx/TorrentTableView.m
View File

@ -344,7 +344,7 @@
if (menu == fUploadMenu || menu == fDownloadMenu)
{
BOOL upload = menu == fUploadMenu;
tr_speedlimit_t mode = [fMenuTorrent speedMode: upload];
int mode = [fMenuTorrent speedMode: upload];
NSMenuItem * item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
[item setState: mode == TR_SPEEDLIMIT_SINGLE ? NSOnState : NSOffState];
@ -384,7 +384,7 @@
- (void) setQuickLimitMode: (id) sender
{
int tag = [sender tag];
tr_speedlimit_t mode;
int mode;
if (tag == ACTION_MENU_UNLIMITED_TAG)
mode = TR_SPEEDLIMIT_UNLIMITED;
else if (tag == ACTION_MENU_LIMIT_TAG)

22
third-party/macosx-libevent-config.h vendored
View File

@ -1,4 +1,4 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
/* Define if kqueue works correctly with pipes */
#define HAVE_WORKING_KQUEUE 1
@ -78,7 +78,7 @@
#endif /* TAILQ_FOREACH */
/* Define to __FUNCTION__ or __file__ if your compiler doesn't have __func__ */
#define __func__ __FILE__
/* #undef __func__ */
/* Define if clock_gettime is available in libc */
/* #undef DNS_USE_CPU_CLOCK_FOR_ID */
@ -128,6 +128,9 @@
/* Define to 1 if you have the `kqueue' function. */
#define HAVE_KQUEUE 1
/* Define to 1 if you have the `nsl' library (-lnsl). */
/* #undef HAVE_LIBNSL */
/* Define to 1 if you have the `resolv' library (-lresolv). */
#define HAVE_LIBRESOLV 1
@ -164,6 +167,12 @@
/* Define if F_SETFD is defined in <fcntl.h> */
#define HAVE_SETFD 1
/* Define to 1 if you have the `sigaction' function. */
#define HAVE_SIGACTION 1
/* Define to 1 if you have the `signal' function. */
#define HAVE_SIGNAL 1
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
@ -215,6 +224,9 @@
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/socket.h> header file. */
#define HAVE_SYS_SOCKET_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@ -276,10 +288,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "1.3c-trunk"
#define VERSION "1.3.99-trunk"
/* Define to appropriate substitue if compiler doesnt have __func__ */
#define __func__ __FILE__
/* #undef __func__ */
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
@ -293,7 +305,7 @@
/* Define to `int' if <sys/types.h> does not define. */
/* #undef pid_t */
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
/* Define to unsigned int if you dont have it */