Fix a conflict between Konqueror and Rekonq for bookmarks

Review Request #101368 - Created May 15, 2011 and submitted

Information
Yoann Laissus
rekonq
273134
Reviewers
rekonq
The branch is here : git://anongit.kde.org/clones/rekonq/laissus/rekonq-clone.git rekonqKonquerorBkConflict
I've made a mistake sorry, please delete this branch in the rekonq repository. I don't have rights to do that.

- Fix a conflict which prevents konqueror from saving bookmarks when rekonq is launched.
- Definitely fix the copy of rekonq default bookmarks if the file doesn't exist. (No problem with Konqueror anymore)
- Tested with a defaultbookmarks.xbel which contains folders and toolbar xml fields
- Tested with konqueror keditbookmarks and rekonq
Yoann Laissus
Review request changed

Description:

~  

The branch is here : git://anongit.kde.org/clones/rekonq/laissus/rekonq-clone.git rekonqKonquerorBkConflict

  ~

The branch is here : git://anongit.kde.org/clones/rekonq/laissus/rekonq-clone.git rekonqKonquerorBkConflict

  + I've made a mistake sorry, please delete this branch in the rekonq repository. I don't have rights to do that.

   
   
  • Fix a conflict which prevents konqueror from saving bookmarks when rekonq is launched.
   
  • Definitely fix the copy of rekonq default bookmarks if the file doesn't exist. (No problem with Konqueror anymore)
Andrea Diamantini
Looks good! Many thanks for this ;)
Please, merge it on master and backport (cherry-pick) it on 0.7 branch. I'll take care of deleting the remote branch created :) 
  1. Merged and backported :)
Loading...