lp:~neric27/midori/mz-sync

Branch merges

On hold for merging into lp:midori

Midori Devs: Pending requested 2013-12-07

Diff: 15594 lines (+15092/-44)

39 files modified

CMakeLists.txt (+6/-0)
extensions/CMakeLists.txt (+18/-0)
extensions/mz-sync/ClientConfig.h (+4/-0)
extensions/mz-sync/README (+279/-0)
extensions/mz-sync/decode.c (+262/-0)
extensions/mz-sync/decode.h (+44/-0)
extensions/mz-sync/glib2.supp (+486/-0)
extensions/mz-sync/js.c (+494/-0)
extensions/mz-sync/js.h (+76/-0)
extensions/mz-sync/main.c (+1221/-0)
extensions/mz-sync/mz-sync-change-tracker.c (+1647/-0)
extensions/mz-sync/mz-sync-change-tracker.h (+113/-0)
extensions/mz-sync/mz-sync-extension.c (+2136/-0)
extensions/mz-sync/mz-sync-extension.h (+205/-0)
extensions/mz-sync/mz-sync-katze-utils.c (+240/-0)
extensions/mz-sync/mz-sync-katze-utils.h (+88/-0)
extensions/mz-sync/mz-sync-panel.c (+1217/-0)
extensions/mz-sync/mz-sync-panel.h (+67/-0)
extensions/mz-sync/mz-sync-persist.c (+317/-0)
extensions/mz-sync/mz-sync-persist.h (+48/-0)
extensions/mz-sync/mz-sync-tabby-session.c (+637/-0)
extensions/mz-sync/mz-sync-tabby-session.h (+96/-0)
extensions/mz-sync/mz-sync-tabby-storage.c (+412/-0)
extensions/mz-sync/mz-sync-tabby-storage.h (+62/-0)
extensions/mz-sync/mz-sync-tabby.h (+52/-0)
extensions/mz-sync/mz-sync.c (+810/-0)
extensions/mz-sync/sample_content_cleartext.json (+100/-0)
extensions/mz-sync/sample_content_cleartext_plus_midori.json (+115/-0)
extensions/mz-sync/sample_content_cleartext_with_tabs.json (+162/-0)
extensions/mz-sync/sync.c (+3330/-0)
extensions/mz-sync/sync.h (+165/-0)
extensions/tabby.vala (+15/-1)
katze/katze-array.c (+53/-2)
katze/katze-arrayaction.c (+10/-0)
midori/midori-array.c (+4/-3)
midori/midori-bookmarks-db.c (+85/-13)
midori/midori-bookmarks-db.h (+3/-4)
midori/midori-browser.c (+12/-20)
panels/midori-bookmarks.c (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related bugs

Related blueprints

6569. By Eric Le Lay on 2014-06-15

fix bug in base32_size (spotted by gue5t)

6568. By Eric Le Lay on 2014-05-18

merge trunk r6701

6567. By Eric Le Lay on 2014-05-18

modify the real bookmarks, mostly working now.

missing memory free

6566. By Eric Le Lay on 2014-05-05

trying to deal with the real bookmarks, INCOMPLETE

Merge basically untested.

6565. By Eric Le Lay on 2014-05-02

fix name<->id mixup

6564. By Eric Le Lay on 2014-05-02

adapt to rename tabby_storage_get_sessions -> get_saved_sessions

6563. By Eric Le Lay on 2014-05-02

merge lp:~aauzi/midori/fix-bookmarks-menu-update-regression r6577

6562. By Eric Le Lay on 2014-05-02

merge trunk r6687

6561. By Eric Le Lay on 2014-05-02

First try to sync real midori bookmarks

- abstract KatzeItem syncid storing and retrieving in mz_sync_katze_utils
  (and it's now a meta_integer instead of the token)
- implement storing missing boolean preferences
- register for changes of MidoriBookmarksDb
- retrieving real midori bookmarks is broken for the moment
- load/save db id<->syncid in string prefs, see mz_sync_persist

6560. By Eric Le Lay on 2014-04-20

update doc