Merge branch 'ikorichSubmodules'

cknitt · Jan 19, 2012 · 4d82e61 · 4d82e61
2 parents 3efa958 + beeb4c2
commit 4d82e61
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 1,519 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 build
 .DS_Store
 Classes/ShareKit/SHKConfig.h
+DerivedData
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,10 @@
 	url = git://github.com/ShareKit/facebook-ios-sdk.git
 [submodule "JSONKit"]
 	path = Submodules/JSONKit
-	url = git://github.com/johnezang/JSONKit.git
+	url = git://github.com/johnezang/JSONKit.git
+[submodule "Submodules/sskeychain"]
+	path = Submodules/sskeychain
+	url = git@github.com:samsoffes/sskeychain
+[submodule "Submodules/objectiveflickr"]
+	path = Submodules/objectiveflickr
+	url = git@github.com:lukhnos/objectiveflickr
diff --git a/Classes/Example/ShareKitDemoConfigurator.m b/Classes/Example/ShareKitDemoConfigurator.m
@@ -190,7 +190,7 @@ - (NSString*)barStyle {
 }
 
 - (UIColor*)barTintForView:(UIViewController*)vc {    
-       
+	
     if ([NSStringFromClass([vc class]) isEqualToString:@"SHKTwitter"]) 
         return [UIColor colorWithRed:0 green:151.0f/255 blue:222.0f/255 alpha:1];
 

diff --git a/Classes/ShareKit/Configuration/LegacySHKConfigurator.m b/Classes/ShareKit/Configuration/LegacySHKConfigurator.m
@@ -41,6 +41,8 @@ @implementation LegacySHKConfigurator
 - (void)dealloc 
 {
     [configuration release];
+
+	[super dealloc];
 }
 
 - (id)init

diff --git a/Classes/ShareKit/Core/Helpers/Keychain/SFHFKeychainUtils.h b/Classes/ShareKit/Core/Helpers/Keychain/SFHFKeychainUtils.h