Permalink
Browse files

Merging changes from CocoaAsyncSocket project (GCDAsyncSocket is now …

…ARC). Fixing several Xcode projects.
  • Loading branch information...
1 parent 2a5b85b commit 0f873f1326328dd18adc8114d948b7932bca30c0 @robbiehanson committed Apr 1, 2012
Showing with 1,011 additions and 1,064 deletions.
  1. +4 −5 Extensions/Roster/CoreDataStorage/XMPPUserCoreDataStorageObject.m
  2. +3 −3 Vendor/CocoaAsyncSocket/GCDAsyncSocket.h
  3. +242 −397 Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
  4. +3 −3 Xcode/DesktopXMPP/XMPPStream.xcodeproj/project.pbxproj
  5. +0 −1 Xcode/ServerlessDemo/Classes/BonjourClient.m
  6. +2 −2 Xcode/ServerlessDemo/Classes/ChatViewController.h
  7. +1 −13 Xcode/ServerlessDemo/Classes/ChatViewController.m
  8. +1 −1 Xcode/ServerlessDemo/Classes/RootViewController.h
  9. +2 −15 Xcode/ServerlessDemo/Classes/RootViewController.m
  10. +6 −6 Xcode/ServerlessDemo/Classes/ServerlessDemoAppDelegate.h
  11. +1 −11 Xcode/ServerlessDemo/Classes/ServerlessDemoAppDelegate.m
  12. +1 −1 Xcode/ServerlessDemo/DDString.m
  13. +5 −5 Xcode/ServerlessDemo/Message.h
  14. +19 −3 Xcode/ServerlessDemo/ServerlessDemo.xcodeproj/project.pbxproj
  15. +12 −12 Xcode/ServerlessDemo/Service.h
  16. +0 −1 Xcode/ServerlessDemo/Service.m
  17. +1 −2 Xcode/ServerlessDemo/StreamController.m
  18. +4 −4 Xcode/ServerlessDemo/main.m
  19. +16 −0 Xcode/Testing/AutoPingTest/Desktop/AutoPingTest.xcodeproj/project.pbxproj
  20. +22 −1 Xcode/Testing/AutoPingTest/Mobile/AutoPingTest.xcodeproj/project.pbxproj
  21. +2 −2 Xcode/Testing/AutoPingTest/Mobile/AutoPingTest/AutoPingTestAppDelegate.h
  22. +4 −4 Xcode/Testing/AutoPingTest/Mobile/AutoPingTest/main.m
  23. +293 −249 Xcode/Testing/AutoTimeTest/Desktop/{AutoTimeTest → }/AutoTimeTest.xcodeproj/project.pbxproj
  24. 0 ...est/Desktop/{AutoTimeTest → }/AutoTimeTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  25. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/AutoTimeTest-Info.plist
  26. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/AutoTimeTest-Prefix.pch
  27. +2 −2 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestAppDelegate.h
  28. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestAppDelegate.m
  29. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/en.lproj/Credits.rtf
  30. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/en.lproj/InfoPlist.strings
  31. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/en.lproj/MainMenu.xib
  32. 0 Xcode/Testing/AutoTimeTest/Desktop/AutoTimeTest/{AutoTimeTest → }/main.m
  33. +334 −290 Xcode/Testing/AutoTimeTest/Mobile/{AutoTimeTest → }/AutoTimeTest.xcodeproj/project.pbxproj
  34. 0 ...Test/Mobile/{AutoTimeTest → }/AutoTimeTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  35. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTest-Info.plist
  36. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTest-Prefix.pch
  37. +2 −2 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestAppDelegate.h
  38. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestAppDelegate.m
  39. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestViewController.h
  40. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/AutoTimeTestViewController.m
  41. 0 ...esting/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/en.lproj/AutoTimeTestViewController.xib
  42. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/en.lproj/InfoPlist.strings
  43. 0 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/en.lproj/MainWindow.xib
  44. +4 −4 Xcode/Testing/AutoTimeTest/Mobile/AutoTimeTest/{AutoTimeTest → }/main.m
  45. +2 −2 Xcode/Testing/AutoTimeTest/XMPPFramework.h
  46. +1 −1 Xcode/Testing/EncodeDecodeTest/Desktop/EncodeDecodeTest.xcodeproj/project.pbxproj
  47. +1 −1 Xcode/Testing/EncodeDecodeTest/Mobile/EncodeDecodeTest.xcodeproj/project.pbxproj
  48. +13 −7 Xcode/Testing/MulticastDelegateTest/MulticastDelegateTest.xcodeproj/project.pbxproj
  49. +2 −2 Xcode/Testing/MulticastDelegateTest/MulticastDelegateTestAppDelegate.h
  50. +5 −11 Xcode/Testing/MulticastDelegateTest/MulticastDelegateTestAppDelegate.m
  51. +1 −1 Xcode/iPhoneXMPP/iPhoneXMPP.xcodeproj/project.pbxproj
@@ -306,11 +306,10 @@ - (void)recalculatePrimaryResource
- (void)updateWithPresence:(XMPPPresence *)presence streamBareJidStr:(NSString *)streamBareJidStr
{
- XMPPResourceCoreDataStorageObject *resource;
- resource = (XMPPResourceCoreDataStorageObject *)[self resourceForJID:[presence from]];
+ XMPPResourceCoreDataStorageObject *resource =
+ (XMPPResourceCoreDataStorageObject *)[self resourceForJID:[presence from]];
- if ([[presence type] isEqualToString:@"unavailable"] ||
- [presence isErrorPresence])
+ if ([[presence type] isEqualToString:@"unavailable"] || [presence isErrorPresence])
{
if (resource)
{
@@ -320,7 +319,7 @@ - (void)updateWithPresence:(XMPPPresence *)presence streamBareJidStr:(NSString *
}
else
{
- if(resource)
+ if (resource)
{
[resource updateWithPresence:presence];
}
@@ -46,7 +46,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
uint32_t flags;
uint16_t config;
- id delegate;
+ __unsafe_unretained id delegate;
dispatch_queue_t delegateQueue;
int socket4FD;
@@ -271,7 +271,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
/**
* Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.
- * For example, a NSData object returned from NSNetservice's addresses method.
+ * For example, a NSData object returned from NSNetService's addresses method.
*
* If you have an existing struct sockaddr you can convert it to a NSData object like so:
* struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
@@ -291,7 +291,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
* Connects to the given address, using the specified interface and timeout.
*
* The address is specified as a sockaddr structure wrapped in a NSData object.
- * For example, a NSData object returned from NSNetservice's addresses method.
+ * For example, a NSData object returned from NSNetService's addresses method.
*
* If you have an existing struct sockaddr you can convert it to a NSData object like so:
* struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
Oops, something went wrong.

0 comments on commit 0f873f1

Please sign in to comment.