Merge lp://qastaging/~gue5t/midori/exec-windowclose into lp://qastaging/midori

Proposed by gue5t gue5t
Status: Merged
Approved by: Cris Dywan
Approved revision: 7094
Merged at revision: 7103
Proposed branch: lp://qastaging/~gue5t/midori/exec-windowclose
Merge into: lp://qastaging/midori
Diff against target: 44 lines (+12/-6)
2 files modified
midori/midori-browser.c (+6/-0)
midori/midori-frontend.c (+6/-6)
To merge this branch: bzr merge lp://qastaging/~gue5t/midori/exec-windowclose
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+283730@code.qastaging.launchpad.net

Commit message

Fix warnings when starting with --execute WindowClose

Description of the change

Right now, starting Midori with "--execute WindowClose" causes a number of assertion failures (more if run with -p):

$ midori -p -e WindowClose

(midori4:21698): Gdk-CRITICAL **: IA__gdk_event_free: assertion 'event != NULL' failed

** (midori4:21698): CRITICAL **: midori_browser_activate_action: assertion 'MIDORI_IS_BROWSER (browser)' failed

** (midori4:21698): CRITICAL **: midori_browser_activate_action: assertion 'MIDORI_IS_BROWSER (browser)' failed

** (midori4:21698): CRITICAL **: midori_browser_activate_action: assertion 'MIDORI_IS_BROWSER (browser)' failed

(midori4:21698): GLib-GObject-WARNING **: instance with invalid (NULL) class pointer

(midori4:21698): GLib-GObject-CRITICAL **: g_signal_connect_data: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed

(midori4:21698): GLib-GObject-WARNING **: instance with invalid (NULL) class pointer

(midori4:21698): GLib-GObject-CRITICAL **: g_signal_connect_data: assertion 'G_TYPE_CHECK_INSTANCE (instance)' failed
^C

This fixes the assertion failures, but it does not fix the fact that the Midori process does not exit when started with "--execute WindowClose" *and* -p. After this patch the execute command works perfectly without -p and quietly sits there with -p.

The problem was twofold: we were inadvertently passing a NULL GdkEvent when emitting the delete_event signal, and in private mode we were running commands before enabling "built-in" extensions. This constructs a GdkEvent to fix the former and reorders things to a more sane sequence of events to fix the latter.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

That actually makes a lot of sense (although it's a weird use case).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: