Fix bug 319559: dragging a bookmark folder over the content view should replace tabs, rather than append (just like dragging over the tab). Patch by Chris Lawson, r=Julian Pellico.

Also fix build warning.

camino/src/browser/BrowserTabView.mm

@@ -398,7 +398,7 @@ NSString* const kTabBarBackgroundDoubleClickedNotification = @"kTabBarBackground
         if ([aBookmark isKindOfClass:[Bookmark class]])
           return [self handleDropOnTab:overTabViewItem overContent:overContentArea withURL:[aBookmark url]];
         else if ([aBookmark isKindOfClass:[BookmarkFolder class]]) {
-          [[[self window] windowController] openURLArray:[aBookmark childURLs] tabOpenPolicy:(overTabViewItem ? eReplaceTabs : eAppendTabs) allowPopups:NO];
+          [[[self window] windowController] openURLArray:[aBookmark childURLs] tabOpenPolicy:((overTabViewItem || overContentArea) ? eReplaceTabs : eAppendTabs) allowPopups:NO];
           return YES;
         }
       } else if ([draggedItems count] > 1) {

camino/src/browser/BrowserWindow.mm

@@ -37,6 +37,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #import "mozView.h"
+#import "NSWorkspace+Utils.h"
+
 #import "BrowserWindow.h"
 #import "BrowserWindowController.h"
 #import "AutoCompleteTextField.h"