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

[gue5t gue5t]

Fix warnings when starting with --execute WindowClose

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.

[Cris Dywan (kalikiana)]

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

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2016-01-15 19:18:17 +0000
+++ midori/midori-browser.c	2016-01-23 20:44:48 +0000
@@ -2898,6 +2898,12 @@
 {
     gboolean val = FALSE;
     GdkEvent* event = gtk_get_current_event();
+
+    /* if current event is null, the action was activated by --execute */
+    if (!event)
+    {
+        event = gdk_event_new (GDK_CLIENT_EVENT);
+    }
     g_signal_emit_by_name (G_OBJECT (browser), "delete-event", event, &val);
     gdk_event_free (event);
 

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2016-01-15 19:18:17 +0000
+++ midori/midori-frontend.c	2016-01-23 20:44:48 +0000
@@ -247,18 +247,18 @@
         midori_browser_add_uri (browser, "about:private");
     gtk_widget_show (GTK_WIDGET (browser));
 
+    /* FIXME need proper stock extension mechanism */
+    midori_browser_activate_action (browser, "libtransfers." G_MODULE_SUFFIX "=true");
+    midori_browser_activate_action (browser, "libabout." G_MODULE_SUFFIX "=true");
+    midori_browser_activate_action (browser, "libopen-with." G_MODULE_SUFFIX "=true");
+    g_assert (g_module_error () == NULL);
+
     for (i = 0; execute_commands && execute_commands[i]; i++)
     {
         midori_browser_assert_action (browser, execute_commands[i]);
         midori_browser_activate_action (browser, execute_commands[i]);
     }
 
-    /* FIXME need proper stock extension mechanism */
-    midori_browser_activate_action (browser, "libtransfers." G_MODULE_SUFFIX "=true");
-    midori_browser_activate_action (browser, "libabout." G_MODULE_SUFFIX "=true");
-    midori_browser_activate_action (browser, "libopen-with." G_MODULE_SUFFIX "=true");
-    g_assert (g_module_error () == NULL);
-
     return browser;
 }