Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 12, 2011
@bdewey Need to make sure the DBRestClient methods are called from the main t…
…hread... I should probably change the caller so this bug doesn't bite me in the future.
acafe3f
@bdewey Added (bad) DropBox icon. 0b12603
View
1  Classes/BDImagePickerController.m
@@ -131,6 +131,7 @@ - (UINavigationController *)dropBoxController {
BDAssetsGroupController *assetsController = [[[BDAssetsGroupController alloc] initWithStyle:UITableViewStylePlain] autorelease];
assetsController.assetsSource = root;
assetsController.title = @"DropBox";
+ assetsController.tabBarItem.image = [UIImage imageNamed:@"dropbox.png"];
assetsController.delegate = self;
UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:assetsController] autorelease];
nav.navigationBar.barStyle = UIBarStyleBlack;
View
4 Classes/IPDropBoxSelectableAsset.m
@@ -82,7 +82,9 @@ - (void)imageAsyncWithCompletion:(void(^)(NSString *filename, NSString *uti))com
self.imageCompletion = completion;
NSString *localPath = [IPPhoto filenameForNewPhoto];
_GTMDevLog(@"Loading image into %@", localPath);
- [self.restClient loadFile:self.metadata.path intoPath:localPath];
+ [[NSOperationQueue mainQueue] addOperationWithBlock:^(void) {
+ [self.restClient loadFile:self.metadata.path intoPath:localPath];
+ }];
}
////////////////////////////////////////////////////////////////////////////////
View
BIN  Resources/dropbox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 ipad-portfolio.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
0A1372EC13E141EA004469E4 /* IPToggleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AD8CF0D13E13CA000BD88E6 /* IPToggleCell.m */; };
+ 0A373C3C141E7F4600EBEAB0 /* dropbox.png in Resources */ = {isa = PBXBuildFile; fileRef = 0A373C3B141E7F4600EBEAB0 /* dropbox.png */; };
0A4F0C7A13D938F8008759F5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A4F0C7913D938F8008759F5 /* Security.framework */; };
0A4F0C8113D944EB008759F5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A4F0C7913D938F8008759F5 /* Security.framework */; };
0A8EB72D14153B0500E4ACA7 /* DBAccountInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A8EB6D814153B0500E4ACA7 /* DBAccountInfo.m */; };
@@ -350,6 +351,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 0A373C3B141E7F4600EBEAB0 /* dropbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dropbox.png; sourceTree = "<group>"; };
0A4F0C7913D938F8008759F5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
0A8EB6D714153B0500E4ACA7 /* DBAccountInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBAccountInfo.h; sourceTree = "<group>"; };
0A8EB6D814153B0500E4ACA7 /* DBAccountInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBAccountInfo.m; sourceTree = "<group>"; };
@@ -951,6 +953,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 0A373C3B141E7F4600EBEAB0 /* dropbox.png */,
0AB426E213DCE87400895092 /* 19-gear.png */,
D343E27A13C96065007330D6 /* gold-thumb.jpg */,
D343E27B13C96065007330D6 /* blue-thumb.jpg */,
@@ -1428,6 +1431,7 @@
0A8EB77F14153B0500E4ACA7 /* db_link_header@2x.png in Resources */,
0A8EB78114153B0500E4ACA7 /* db_logo.png in Resources */,
0A8EB78314153B0500E4ACA7 /* db_logo@2x.png in Resources */,
+ 0A373C3C141E7F4600EBEAB0 /* dropbox.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

No commit comments for this range

Something went wrong with that request. Please try again.