]> Git Repo - VerusCoin.git/commitdiff
LSSharedFileListItemResolve() was deprecated in Mac OS X 10.10, use LSSharedFileListI...
authorCory Fields <[email protected]>
Wed, 21 Jan 2015 06:49:14 +0000 (07:49 +0100)
committerPavel Janík <[email protected]>
Wed, 21 Jan 2015 18:07:28 +0000 (19:07 +0100)
src/qt/guiutil.cpp

index c675235cc2685b2179bab8e24e0baed9edc79064..149e0da4421eb4f369ca0c552e5fdf9a26a373e8 100644 (file)
@@ -696,7 +696,18 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef
         LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(listSnapshot, i);
         UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes;
         CFURLRef currentItemURL = NULL;
-        LSSharedFileListItemResolve(item, resolutionFlags, &currentItemURL, NULL);
+
+#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 10100
+       if(&LSSharedFileListItemCopyResolvedURL)
+           currentItemURL = LSSharedFileListItemCopyResolvedURL(item, resolutionFlags, NULL);
+#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 10100
+       else
+           LSSharedFileListItemResolve(item, resolutionFlags, &currentItemURL, NULL);
+#endif
+#else
+       LSSharedFileListItemResolve(item, resolutionFlags, &currentItemURL, NULL);
+#endif
+
         if(currentItemURL && CFEqual(currentItemURL, findUrl)) {
             // found
             CFRelease(currentItemURL);
This page took 0.022985 seconds and 4 git commands to generate.