summaryrefslogtreecommitdiff
path: root/src/bookmarks
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-13 10:57:26 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-13 10:57:26 +0200
commit6c29ef52a8d911173ea6bfb3f62caa9187612ab2 (patch)
tree002c715ca58597ff06878d53d7ba37973da00aac /src/bookmarks
parentFix the double fill of the bookmark bar at startup (diff)
parentFix the BK panel's drag and drop (diff)
downloadrekonq-6c29ef52a8d911173ea6bfb3f62caa9187612ab2.tar.xz
Merge commit 'refs/merge-requests/168' of git://gitorious.org/rekonq/mainline into m168
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/bookmarkstreemodel.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 7063bf9b..299efaf0 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -406,15 +406,15 @@ bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
if (parent.isValid())
root = bookmarkForIndex(parent).toGroup();
- if (!destIndex.isValid())
+ if (destIndex.isValid() && row != -1)
{
- root.deleteBookmark(bookmark);
- root.addBookmark(bookmark);
- }
+ root.moveBookmark(bookmark, root.previous(dropDestBookmark));
- else if (row != 1)
+ }
+ else
{
- root.moveBookmark(bookmark, root.previous(dropDestBookmark));
+ root.deleteBookmark(bookmark);
+ root.addBookmark(bookmark);
}
Application::bookmarkProvider()->bookmarkManager()->emitChanged();