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

#3072 Make Transmission look for the web ui folder in the Application Support folder first

This commit is contained in:
Mitchell Livingston 2010-03-24 23:41:08 +00:00
parent 0cbdd6c48c
commit d1229a263c
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libtransmission/platform.c
View File

@ -544,27 +544,38 @@ tr_getWebClientDir( const tr_session * session UNUSED )
else
{
#ifdef SYS_DARWIN /* on Mac, look in the app package first, then the Application Support folder (for daemon, etc) */
#ifdef SYS_DARWIN /* on Mac, look in the Application Support folder first, then in the app bundle. */
CFURLRef appURL = CFBundleCopyBundleURL( CFBundleGetMainBundle( ) );
CFStringRef appRef = CFURLCopyFileSystemPath( appURL,
kCFURLPOSIXPathStyle );
const char * appString = CFStringGetCStringPtr( appRef,
CFStringGetFastestEncoding( appRef ) );
CFRelease( appURL );
CFRelease( appRef );
s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
/* Look in the Application Support folder */
s = tr_buildPath( tr_sessionGetConfigDir( session ), "web", NULL );
if( !isWebClientDir( s ) ) {
tr_free( s );
/* Fallback to the Application Support folder */
s = tr_buildPath( tr_sessionGetConfigDir( session ), "web", NULL );
CFURLRef appURL = CFBundleCopyBundleURL( CFBundleGetMainBundle( ) );
CFStringRef appRef = CFURLCopyFileSystemPath( appURL,
kCFURLPOSIXPathStyle );
CFIndex appLength = CFStringGetMaximumSizeForEncoding( CFStringGetLength(appRef),
CFStringGetFastestEncoding( appRef ));
char * appString = tr_malloc( appLength + 1 );
tr_bool success = CFStringGetCString( appRef,
appString,
appLength + 1,
CFStringGetFastestEncoding( appRef ));
assert( success );
CFRelease( appURL );
CFRelease( appRef );
/* Fallback to the app bundle */
s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
if( !isWebClientDir( s ) ) {
tr_free( s );
s = NULL;
}
tr_free( appString );
}
#elif defined( WIN32 )