From b5eb2395e1774d2b9c583f520ee5b575986b6e90 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Wed, 28 Aug 2002 23:55:53 +0000 Subject: [PATCH] Tweak to the fix for bug 164936: don't try to clone bookmark folders on option-drag, until we can do a deep copy. git-svn-id: svn://10.0.0.236/branches/CHIMERA_M1_0_1_BRANCH@128401 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/src/bookmarks/BookmarksService.mm | 6 +++++- mozilla/chimera/src/bookmarks/BookmarksService.mm | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/camino/src/bookmarks/BookmarksService.mm b/mozilla/camino/src/bookmarks/BookmarksService.mm index 8d145605e05..9423119ed6f 100644 --- a/mozilla/camino/src/bookmarks/BookmarksService.mm +++ b/mozilla/camino/src/bookmarks/BookmarksService.mm @@ -1353,7 +1353,11 @@ BookmarksService::PerformBookmarkDrop(BookmarkItem* parent, BookmarkItem* before // remove it from the tree if (draggedNode != proposedParent) // paranoia. This should never happen { - if (doCopy) + nsCOMPtr tagName; + draggedNode->GetTag(*getter_AddRefs(tagName)); + bool srcIsFolder = (tagName == BookmarksService::gFolderAtom); + + if (doCopy && !srcIsFolder) { // need to clone nsCOMPtr srcElement = do_QueryInterface(draggedNode); diff --git a/mozilla/chimera/src/bookmarks/BookmarksService.mm b/mozilla/chimera/src/bookmarks/BookmarksService.mm index 8d145605e05..9423119ed6f 100644 --- a/mozilla/chimera/src/bookmarks/BookmarksService.mm +++ b/mozilla/chimera/src/bookmarks/BookmarksService.mm @@ -1353,7 +1353,11 @@ BookmarksService::PerformBookmarkDrop(BookmarkItem* parent, BookmarkItem* before // remove it from the tree if (draggedNode != proposedParent) // paranoia. This should never happen { - if (doCopy) + nsCOMPtr tagName; + draggedNode->GetTag(*getter_AddRefs(tagName)); + bool srcIsFolder = (tagName == BookmarksService::gFolderAtom); + + if (doCopy && !srcIsFolder) { // need to clone nsCOMPtr srcElement = do_QueryInterface(draggedNode);