Comment 32 for bug 836707

Attached is gotik_'s patch on top of the change in bug 983821 (that is, it's the same patch as the one in comment #21 here, except the bookmarks functions from main.c are now in midori/midori-bookmarks.c).