Lots of stuff

Sorry I don't keep a list when working on this code.

Author: jerrykrinock

MAKVONotificationCenter.m

@@ -140,11 +140,17 @@ + (id)defaultCenter
 		//    if center is not nil, does nothing and returns false
 		//       This will happen if another thread snuck in and set it.
 		// Mike's original line, does not work with garbage collection.
-		//   if(!OSAtomicCompareAndSwapPtrBarrier(nil, newCenter, (void *)&center)) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 		// See Brian Webster's first comment in http://www.mikeash.com/?page=pyblog/key-value-observing-done-right.html
 		// Patched line:
-		if(!objc_atomicCompareAndSwapGlobalBarrier(nil, newCenter, &center)) {
-			// Thread race has occurred and we lost
+		BOOL weWon = objc_atomicCompareAndSwapGlobalBarrier(nil, newCenter, &center) ;
+#else
+        // Mike's original code, does not support Garbage Collection but works
+        // in 10.5 and earlier
+        BOOL weWon = OSAtomicCompareAndSwapPtrBarrier(nil, newCenter, (void *)&center) ;
+#endif
+        if (!weWon) {
+            // Thread race has occurred and we lost
 			// center has previously been set to newCenter by another thread
 			[newCenter release];
 		}

SSRSS.m

@@ -106,20 +106,7 @@ - (SSRSS *) initWithData:(NSData *) rssData normalize:(BOOL)fl {
 			encoding = documentInfo->encoding ;
 			CFRelease (tree);
 		}
-		else {
-			NSString* dataString = [[NSString alloc] initWithData:rssData encoding:NSASCIIStringEncoding] ;
-			// We used ASCII because if the string is corrupt UTF8 may fail
-			[dataString release] ;
-			
-			NSString* filePath = [NSString stringWithFormat:
-								  @"%@/Desktop/GoogleBad.%@.%lx.data",
-								  NSHomeDirectory(),
-								  NSUserName(),
-								  (long)[[NSDate date] timeIntervalSinceReferenceDate]] ;
-			NSString* msg = @"Could not parse data from Google containing some bookmarks.\n\n Some of your Google Bookmarks may be missing.\n\nFile containing bad data was written to your desktop." ;
-			[rssData writeToFile:filePath atomically:NO] ;
-			NSRunCriticalAlertPanel(nil, msg, nil, nil, nil) ;
-			
+		else {			
 			// See http://lists.apple.com/archives/Objc-language/2008/Sep/msg00133.html ...
 			[super dealloc] ;
 			self = nil ;