[rekonq] Re: Review Request: Fix a conflict between Konqueror and Rekonq for bookmarks

[Yoann Laissus]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/101368/
-----------------------------------------------------------

(Updated May 15, 2011, 1:10 p.m.)


Review request for rekonq.


Summary (updated)
-------

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)


This addresses bug 273134.
    /show_bug.cgi?id=273134


Diffs
-----

  src/bookmarks/bookmarkprovider.h 4af97ef 
  src/bookmarks/bookmarkprovider.cpp cef6eae 

Diff: http://git.reviewboard.kde.org/r/101368/diff


Testing
-------

- Tested with a defaultbookmarks.xbel which contains folders and toolbar xml fields
- Tested with konqueror keditbookmarks and rekonq


Thanks,

Yoann

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/rekonq/attachments/20110515/b259832f/attachment.htm