]> granicus.if.org Git - transmission/commitdiff
re-add r9257 on 10.6
authorMitchell Livingston <livings124@transmissionbt.com>
Sat, 10 Oct 2009 13:24:13 +0000 (13:24 +0000)
committerMitchell Livingston <livings124@transmissionbt.com>
Sat, 10 Oct 2009 13:24:13 +0000 (13:24 +0000)
macosx/Controller.m
macosx/NSApplicationAdditions.h
macosx/TorrentTableView.h

index ded00ced6ec4a89760fa9d00880f80dc8bd1f81b..5fb97f28a95c3dae3f75b07636efbb58868c7ef4 100644 (file)
@@ -171,13 +171,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     //make sure another Transmission.app isn't running already
     BOOL othersRunning = NO;
     
-    #warning enable when 10.6-only
-    /*if ([NSApp isOnSnowLeopardOrBetter])
+    if ([NSApp isOnSnowLeopardOrBetter])
     {
-        NSArray * apps = [NSRunningApplication runningApplicationsWithBundleIdentifier: [[NSBundle mainBundle] bundleIdentifier]];
+        NSArray * apps = [NSRunningApplicationSL runningApplicationsWithBundleIdentifier: [[NSBundle mainBundle] bundleIdentifier]];
         othersRunning = [apps count] > 1;
     }
-    else*/
+    else
     {
         NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
         const int processIdentifier = [[NSProcessInfo processInfo] processIdentifier];
index ec7c37f4f3bc23990d60b057b2667b24b05d9c48..c468e6cb90fddc4d52199b15ca5ea75a836491d1 100644 (file)
@@ -23,6 +23,7 @@
  *****************************************************************************/
 
 #define QLPreviewPanelSL NSClassFromString(@"QLPreviewPanel")
+#define NSRunningApplicationSL NSClassFromString(@"NSRunningApplication")
 
 @interface NSApplication (NSApplicationAdditions)
 
index 9eb8f09b0fc6a1bb02026b0d96fe148708cf5b88..4678b53d0f16c2fe8d187d09811f262e0f3a494a 100644 (file)
@@ -31,7 +31,7 @@
 
 #define GROUP_SEPARATOR_HEIGHT 18.0
 
-#warning revert
+#warning uncomment
 @interface TorrentTableView : NSOutlineView //<QLPreviewPanelDataSource, QLPreviewPanelDelegate>
 {
     IBOutlet Controller * fController;