Merge lp://staging/~neric27/midori/mz-sync into lp://staging/midori

add "add bookmark" button in panel to play with sync

current page is added to the synced bookmarks but will be squashed
upon the next sync since changes are not yet pulled to the server.

removed some g_object_unref because they triggered assertion error.
Not sure about that

compile standalone sync client

use unencrypted content on disk to facilitate inspection during development

Howto about testing mz-sync

merge from midori trunk

add and delete bookmarks on server, generate_id fixed

- generate_id now really returns a string of length 12 (was too short)
- WBOs can be individually deleted instead of the whole collection previously
- if one adds a bookmark, the parent must then be modified to include it

factor code of delete_collection_int and delete_wbos_by_id_int; formatting

upload bookmark changes on server

- now a button to add current tab to synced bookmarks
- now context menu to delete selected bookmark/folder from synced bookmarks
- depending on sync options, bookmarks are added/deleted on server
- bookmarks are not yet monitored for changes

fix crashes when add,sync,delete,sync

- count newly added when updating bookmarks to still break even
- add bookmark to trash before removing from parent array so it's not freed

add comment

shortest status message

delay first sync until first window created

also show first sync status in panel

ease valgrind debugging

add/remove folder

this is just a stub so calling folder "dummy" for now

fix memory leaks in MzSync

list synced tabs

prepare for tabs upload

firefox sync insists in having a parentid in bookmarks and folders

don't printf unknown string.

Caused the inevitable segfault when string to print contained percents.
The actual one was 'fprintf(file, jsn)' but I changed all to fputs/fputc.

don't hard delete bookmarks and folders but mark them deleted

This is the only way Firefox won't reinstantiate them upon next sync.
They consume space so must be purged at some time: when
we hit a quota limit maybe. Firefox never seems to delete them except
when user chooses to delete all data.

merge Trunk

add the sessionId field to synced tab to handle multiple sessions

This is not supported but hopefully ignored by Firefox Sync.

show sessionId in MzSync --list-tabs

an error dialog that actually works

implement Tabby's Storage (not complete) using mz-sync as backend

Tabby does nothing concrete with the mz-sync backend (see method
register_storage in tabby.vala)

merge trunk r6595

fix uninitialized variable

fix segfault when deleting root folders in bookmarks

Prevent user from deleting them.
There is still the case when switching to an empty sync account,
where they are deleted programatically. Then
mz_sync_panel_remove_iter uses a different way to iterate.

new function create_bookmarks to create default bookmark items

Also fix an bug where children property was not created in wbo for folder
with null children array. Now the children property is created as empty
array.

Minor change in syncItem_to_wbo where it uses the correct collection name
for bookmarks/tabs to encrypt. This makes no change since there is only
one collection key, but it could, if different keys were used per session.

mz-sync: create default bookmarks when registering.

Doesn't take the sync options into account because registering to use
mz-sync in shadow mode doesn't make sense. Register with the other program
if you want that.

use registered storage for real.

If the other extension takes too long to activate
(blocks on an error dialog in my case), the local storage will still be used.
This is not intended.

Anyway some combination of local/remote storage should be used.

implement MzSyncTabbyStorage, MzSyncTabbySession, plug into tabby

It passes the Firefox test: open tabs seen by running ff with same account
(must refresh each time in about:sync-tabs to see new content,
 but no need to click "sync now").

Fix a bug when deleting items with ids containing + or / (they are base 64).

merge trunk r6613

MzSync: export bookmarks as HTML by default

updated README

free session, save icon

MzSyncTabbySession should free its memory now.

the icon is always null for tabs.

fix string not duplicated resulting in crash at startup

fix wrong variable used, resulting in always restoring tabs from last client

fix a double g_strdup resulting in memory leak

Show tabs from other devices in panel.

Saving own tabs is done via the MzSyncTabbySession for now.
Another solution based on polling could be used to save tabs if not
hooking into MzSyncTabbySession, for users wanting to keep tabby session local,
but to "publish" open tabs for other devices.
This solution would extend the code used to refresh displayed tabs, to upload own
tabs after downloading, like for bookmarks.

only fetch modified tabs; load tabs at startup

only fetch changed bookmarks since last sync from server

restore gtk2 compatibility

fix errors pointed by extra warnings

merge trunk rev 6669

adapt to tabby_base_session_get_tab_sorting return double, not double*

turbo mode: sync every 5 seconds

This is handy when running sync on two devices side by side and wanting
changes to be propagated almost instantly. Since the Sync API is based
on polling this adds traffic and server load (not too much since
If-Modified-Since and newer are used).

update doc

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

merge trunk r6687

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

adapt to rename tabby_storage_get_sessions -> get_saved_sessions

fix name<->id mixup

trying to deal with the real bookmarks, INCOMPLETE

Merge basically untested.

modify the real bookmarks, mostly working now.

missing memory free

merge trunk r6701

fix bug in base32_size (spotted by gue5t)