midori -p http://google.com/ results in error "Cancelled"

[gue5t gue5t]

To reproduce: run the command "midori -p http://google.com/" or "midori -a http://google.com/".

I get an error page with the detail "Cancelled" instead of the page requested.

[gue5t gue5t (gue5t)]

This seems to be caused by calling midori_load_soup_session after midori_browser_add_uri. Moving the call to midori_load_soup_session earlier fixes the problem for both app and private mode, but I'm not familiar with what it does such that I'd prefer if someone else who understands possible side-effects of the change could make a patch. If not I'll look into it further later and see what I come up with.

[gue5t gue5t (gue5t)]

Looking into it more, I was overestimating its complexity. See simple patch.

[Cris Dywan (kalikiana)]

The idea is right, but let's take it a step further. I added a check in midori_browser_add_tab for "midori-session-initialized", and now this is set after preparing the session. Now it becomes very obvious if the session preparation was too late.
I also realize private browsing-specific settings were applied after one of the midori_browser_add_uri calls, which is not good. So I'm moving this around.

[Cris Dywan (kalikiana)]

Thanks for investigating! I committed changes as stated, it should work fine now. Please yell if you see the new warning show up.