aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-03-04 19:11:12 +0000
committerstuconnolly <stuart02@gmail.com>2012-03-04 19:11:12 +0000
commite2fbd102c251671d42c33c5e748ceb06c4926ceb (patch)
treeed6e8faed7a1f0195fcf0d409d094bc96fa64ff3 /Source
parentc9ac1028d6b430de61b376257beee1d5747c7783 (diff)
downloadsequelpro-e2fbd102c251671d42c33c5e748ceb06c4926ceb.tar.gz
sequelpro-e2fbd102c251671d42c33c5e748ceb06c4926ceb.tar.bz2
sequelpro-e2fbd102c251671d42c33c5e748ceb06c4926ceb.zip
Would help if I committed the right file.
Diffstat (limited to 'Source')
-rw-r--r--Source/SPConnectionControllerDelegate.m9
-rw-r--r--Source/SPTreeNode.m8
2 files changed, 12 insertions, 5 deletions
diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m
index 12a364f0..5230ff5a 100644
--- a/Source/SPConnectionControllerDelegate.m
+++ b/Source/SPConnectionControllerDelegate.m
@@ -170,7 +170,8 @@ static NSString *SPDatabaseImage = @"database-small";
}
[pboard declareTypes:[NSArray arrayWithObject:SPFavoritesPasteboardDragType] owner:self];
- [pboard setData:[NSKeyedArchiver archivedDataWithRootObject:items] forType:SPFavoritesPasteboardDragType];
+ //[pboard setData:[NSKeyedArchiver archivedDataWithRootObject:items] forType:SPFavoritesPasteboardDragType];
+ [pboard setData:[NSData data] forType:SPFavoritesPasteboardDragType];
return YES;
}
@@ -211,10 +212,12 @@ static NSString *SPDatabaseImage = @"database-small";
{
[menuItem setState:NSOffState];
}
+
+ NSArray *nodes = [self selectedFavoriteNodes];
- NSArray *nodes = [NSKeyedUnarchiver unarchiveObjectWithData:[[info draggingPasteboard] dataForType:SPFavoritesPasteboardDragType]];
+ //NSArray *nodes = [NSKeyedUnarchiver unarchiveObjectWithData:[[info draggingPasteboard] dataForType:SPFavoritesPasteboardDragType]];
- if (![nodes count]) return acceptedDrop;
+ //if (![nodes count]) return acceptedDrop;
if ([node isGroup]) {
if (index == NSOutlineViewDropOnItemIndex) {
diff --git a/Source/SPTreeNode.m b/Source/SPTreeNode.m
index d93db01b..f787816a 100644
--- a/Source/SPTreeNode.m
+++ b/Source/SPTreeNode.m
@@ -236,14 +236,18 @@ static NSString *SPTreeNodeIsGroupKey = @"SPTreeNodeIsGroup";
for (SPTreeNode *node in [self childNodes])
{
- [children addObject:[node dictionaryRepresentation]];
+ NSDictionary *representation = [node dictionaryRepresentation];
+
+ if (representation) {
+ [children addObject:representation];
+ }
}
dictionary = [NSMutableDictionary dictionary];
NSString *name = (![self parentNode]) ? NSLocalizedString(@"Favorites", @"favorites label") : [object nodeName];
- [dictionary setObject:(name) ? name : @"" forKey:SPFavoritesGroupNameKey];
+ [dictionary setObject:name ? name : @"" forKey:SPFavoritesGroupNameKey];
[dictionary setObject:children forKey:SPFavoriteChildrenKey];
}