Merge lp://qastaging/~elementary-apps/midori/remove-lightwindow into lp://qastaging/midori

When clicking Cancel on the dialog (cancel didn't exist on the lightwindow, just closing it didn't crash midori) midori crashes. Here's the stacktrace:
Program received signal SIGSEGV, Segmentation fault.
0x00007ffff7b34795 in midori_browser_get_settings (browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-browser.c:3008
3008 g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
(gdb) backtrace
#0 0x00007ffff7b34795 in midori_browser_get_settings (browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-browser.c:3008
#1 0x00007ffff7b48105 in midori_private_data_dialog_response_cb (
    button=0xde63a0, browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-privatedata.c:52
#2 0x00007ffff78833b8 in g_closure_invoke (closure=0xde3180,
    return_value=0x0, n_param_values=2, param_values=0x7fffffffc9d0,
    invocation_hint=0x7fffffffc970)
    at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:768
#3 0x00007ffff7894d3d in signal_emit_unlocked_R (node=node@entry=0x7704b0,
    detail=detail@entry=0, instance=instance@entry=0xde63a0,
    emission_return=emission_return@entry=0x0,
    instance_and_params=instance_and_params@entry=0x7fffffffc9d0)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3551
#4 0x00007ffff789ca29 in g_signal_emit_valist (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>,
    var_args=var_args@entry=0x7fffffffcb68)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3307
#5 0x00007ffff789cce2 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3363
---Type <return> to continue, or q <return> to quit---
#6 0x00007ffff78835e7 in _g_closure_invoke_va (closure=0xd16630,
    return_value=0x0, instance=0xd447a0, args=0x7fffffffce18, n_params=0,
    param_types=0x0) at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:831
#7 0x00007ffff789c088 in g_signal_emit_valist (instance=0xd447a0,
    signal_id=<optimized out>, detail=0,
    var_args=var_args@entry=0x7fffffffce18)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3215
#8 0x00007ffff789cce2 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3363
#9 0x00007ffff6cef8fd in gtk_button_do_release (button=0xd447a0,
    emit_clicked=<optimized out>)
    at /build/buildd/gtk+3.0-3.12.2/./gtk/gtkbutton.c:1985
#10 0x00007ffff6cef943 in gtk_real_button_released (button=0xd447a0)
    at /build/buildd/gtk+3.0-3.12.2/./gtk/gtkbutton.c:2103
#11 0x00007ffff78833b8 in g_closure_invoke (closure=0x64ef10,
    return_value=0x0, n_param_values=1, param_values=0x7fffffffd0d0,
    invocation_hint=0x7fffffffd070)
    at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:768
#12 0x00007ffff7894557 in signal_emit_unlocked_R (node=node@entry=0x64ef40,
    detail=detail@entry=0, instance=instance@entry=0xd447a0,
    emission_return=emission_return@entry=0x0,
    instance_and_params=instance_and_params@entry...

There were a couple of other ifdefs I missed. Shouldn't crash now

Ok, thanks for the fix.