Browse files

Merge branch 'master' of github.com:nrj/objective-curl

  • Loading branch information...
2 parents 3e3642d + 1a4983b commit 390515333a5d08b775769dd0c954291e3f36e911 @nrj committed Nov 23, 2010
View
20 English.lproj/MainMenu.xib
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="449"/>
+ <integer value="717"/>
<integer value="29"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -1112,7 +1112,7 @@
<object class="NSSecureTextFieldCell" key="NSCell" id="659381111">
<int key="NSCellFlags">343014976</int>
<int key="NSCellFlags2">4326400</int>
- <string key="NSContents">lpGxeYHKRHKs1SDmAwfJ23WMExxEUq6/nDHgPYaS</string>
+ <string key="NSContents">yaynocops</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
@@ -1153,7 +1153,7 @@
<object class="NSTextFieldCell" key="NSCell" id="510153074">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">4326400</int>
- <string key="NSContents">AKIAIHIMODANQEZ34T5A</string>
+ <string key="NSContents">nrj</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="370322315"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -1170,7 +1170,7 @@
<object class="NSTextFieldCell" key="NSCell" id="790701010">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272761856</int>
- <string key="NSContents">s3.amazonaws.com</string>
+ <string key="NSContents">localhost</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="638388920"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -1300,7 +1300,7 @@
<object class="NSTextFieldCell" key="NSCell" id="18424731">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272761856</int>
- <string key="NSContents">/Users/nrj/Music/iTunes/iTunes Music/Cake</string>
+ <string key="NSContents">/Users/nrj/Desktop/ai_trunk</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="889008429"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -1317,7 +1317,7 @@
<object class="NSTextFieldCell" key="NSCell" id="5519405">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272761856</int>
- <string key="NSContents">nickjensen</string>
+ <string key="NSContents">/tmp</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="637258183"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -1366,7 +1366,7 @@
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="735198592">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">FTP</string>
<reference key="NSSupport" ref="695996701"/>
@@ -1390,7 +1390,7 @@
<int key="NSPeriodicInterval">75</int>
</object>
<object class="NSButtonCell" id="380031538">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Amazon S3</string>
<reference key="NSSupport" ref="695996701"/>
@@ -1461,8 +1461,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
- <int key="NSSelectedRow">3</int>
- <reference key="NSSelectedCell" ref="380031538"/>
+ <int key="NSSelectedRow">1</int>
+ <reference key="NSSelectedCell" ref="735198592"/>
<reference key="NSBackgroundColor" ref="907046648"/>
<reference key="NSCellBackgroundColor" ref="850842249"/>
<object class="NSFont" key="NSFont">
View
2 objective-curl.xcodeproj/project.pbxproj
@@ -802,7 +802,6 @@
PREBINDING = NO;
SDKROOT = macosx10.5;
USER_HEADER_SEARCH_PATHS = "${SOURCE_ROOT}/include";
- VALID_ARCHS = i386;
};
name = Debug;
};
@@ -822,7 +821,6 @@
PREBINDING = NO;
SDKROOT = macosx10.5;
USER_HEADER_SEARCH_PATHS = "${SOURCE_ROOT}/include";
- VALID_ARCHS = i386;
};
name = Release;
};
View
4 operations/CurlOperation.m
@@ -36,8 +36,8 @@ - (id)initWithHandle:(CURL *)aHandle delegate:(id)aDelegate
*/
- (void)dealloc
{
- curl_easy_cleanup(handle);
-
+ handle = NULL;
+
curl_global_cleanup();
[super dealloc];
View
3 operations/UploadOperation.m
@@ -104,6 +104,9 @@ - (void)main
[upload setTotalFilesUploaded:i + 1];
}
+ // Cleanup Curl
+ curl_easy_cleanup(handle);
+
// Cleanup the files array.
[filesToUpload release];

0 comments on commit 3905153

Please sign in to comment.