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

on 10.6 simplify the check for already-running Transmission instances

This commit is contained in:
Mitchell Livingston 2009-10-10 00:00:46 +00:00
parent 92d4f435b4
commit 444f8f553f
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
macosx/Controller.m
View File

@ -169,30 +169,43 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
+ (void) initialize
{
//make sure another Transmission.app isn't running already
NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
int processIdentifier = [[NSProcessInfo processInfo] processIdentifier];
for (NSDictionary * dic in [[NSWorkspace sharedWorkspace] launchedApplications])
BOOL othersRunning = NO;
if ([NSApp isOnSnowLeopardOrBetter])
{
if ([[dic objectForKey: @"NSApplicationBundleIdentifier"] isEqualToString: bundleIdentifier]
&& [[dic objectForKey: @"NSApplicationProcessIdentifier"] intValue] != processIdentifier)
NSArray * apps = [NSRunningApplication runningApplicationsWithBundleIdentifier: [[NSBundle mainBundle] bundleIdentifier]];
othersRunning = [apps count] > 1;
}
else
{
NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
const int processIdentifier = [[NSProcessInfo processInfo] processIdentifier];
for (NSDictionary * dic in [[NSWorkspace sharedWorkspace] launchedApplications])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"Quit", "Transmission already running alert -> button")];
[alert setMessageText: NSLocalizedString(@"Transmission is already running.",
"Transmission already running alert -> title")];
[alert setInformativeText: NSLocalizedString(@"There is already a copy of Transmission running. "
"This copy cannot be opened until that instance is quit.", "Transmission already running alert -> message")];
[alert setAlertStyle: NSCriticalAlertStyle];
[alert runModal];
[alert release];
//kill ourselves right away
exit(0);
if ([[dic objectForKey: @"NSApplicationBundleIdentifier"] isEqualToString: bundleIdentifier]
&& [[dic objectForKey: @"NSApplicationProcessIdentifier"] intValue] != processIdentifier)
othersRunning = YES;
}
}
if (othersRunning)
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"Quit", "Transmission already running alert -> button")];
[alert setMessageText: NSLocalizedString(@"Transmission is already running.",
"Transmission already running alert -> title")];
[alert setInformativeText: NSLocalizedString(@"There is already a copy of Transmission running. "
"This copy cannot be opened until that instance is quit.", "Transmission already running alert -> message")];
[alert setAlertStyle: NSCriticalAlertStyle];
[alert runModal];
[alert release];
//kill ourselves right away
exit(0);
}
[[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile:
[[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]];

2
macosx/TorrentCell.m
View File

@ -699,7 +699,7 @@
NSRect result;
result.size = [string size];
result.origin.x = NSMaxX(bounds) - result.size.width - PADDING_HORIZONTAL;
result.origin.x = NSMaxX(bounds) - (NSWidth(result) + PADDING_HORIZONTAL);
result.origin.y = NSMinY(bounds) + PADDING_ABOVE_MIN_STATUS;
return result;