diff options
| author | gue5t <gue5t@midori.launchpad> | 2016-01-23 13:21:31 -0600 |
|---|---|---|
| committer | gue5t <gue5t@midori.launchpad> | 2016-01-23 13:21:31 -0600 |
| commit | 26de5e507f3c4abb6193ea9bc788dc31712ae1ea (patch) | |
| tree | 77a576a2fdbd572fa7fe297f66bdbc1da12e6c5e | |
| parent | 4abecd76ef3ba0c0c178190c7bea0efeb540a8c0 (diff) | |
| download | midori-git-26de5e507f3c4abb6193ea9bc788dc31712ae1ea.tar.gz | |
Fix warnings when starting with --execute WindowClose
| -rw-r--r-- | midori/midori-browser.c | 6 | ||||
| -rw-r--r-- | midori/midori-frontend.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8b4a4390..0e6cdaa1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2898,6 +2898,12 @@ _action_window_close_activate (GtkAction* action, { 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); diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c index 7a0104c9..7b6e0c1d 100644 --- a/midori/midori-frontend.c +++ b/midori/midori-frontend.c @@ -247,18 +247,18 @@ midori_private_app_new (const gchar* config, midori_browser_add_uri (browser, "about:private"); gtk_widget_show (GTK_WIDGET (browser)); - 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); + 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]); + } + return browser; } |