diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-10-03 02:50:51 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-10-03 02:50:51 +0800 |
| commit | abe1a40d562514cfe6b3c8dae1397d511062ddab (patch) | |
| tree | 08fb5018af362336c9b92f0e1d83d25c2bd3b2b8 /src/ephy-python.c | |
| parent | 8a92076ee578e5c6aa8bb0a39fcdbe8741ce2e52 (diff) | |
| download | gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar.gz gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar.bz2 gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar.lz gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar.xz gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.tar.zst gsoc2013-epiphany-abe1a40d562514cfe6b3c8dae1397d511062ddab.zip | |
Use nsIDOMWindowInternal::Close to close tabs. Delay tabs destruction to
2005-10-02 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* embed/ephy-embed-shell.c: (ephy_embed_shell_dispose),
(ephy_embed_shell_finalize), (ephy_embed_shell_class_init):
* embed/ephy-embed.c: (ephy_embed_base_init),
(ephy_embed_show_page_certificate), (ephy_embed_close):
* embed/ephy-embed.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/mozilla-embed.cpp:
* src/ephy-notebook.c: (ephy_notebook_class_init),
(close_button_clicked_cb):
* src/ephy-notebook.h:
* src/ephy-python.c: (ephy_python_init), (ephy_python_shutdown),
(ephy_python_schedule_gc):
* src/ephy-shell.c: (ephy_shell_class_init), (gnome_session_init),
(ephy_shell_dispose), (ephy_shell_finalize):
* src/ephy-tab.c: (ephy_tab_init):
* src/ephy-window.c: (construct_confirm_close_dialog),
(confirm_close_with_modified_forms), (embed_modal_alert_cb),
(idle_tab_remove_cb), (schedule_tab_close),
(embed_close_request_cb), (embed_destroy_browser_cb),
(tab_added_cb), (tab_removed_cb), (tab_close_request_cb),
(setup_notebook), (remove_true), (ephy_window_dispose),
(cancel_handler), (ephy_window_init), (ephy_window_finalize):
* src/window-commands.c: (event_with_shift),
(window_cmd_view_reload), (window_cmd_file_close_window):
Use nsIDOMWindowInternal::Close to close tabs. Delay tabs destruction
to an idle handler, to avoid crashes when tabs are closed from signal
handlers (blur, mousedown, keydown etc).
Fixes bug #172878, bug #172879, bug #172882, bug #303254, bug #313425.
Diffstat (limited to 'src/ephy-python.c')
| -rw-r--r-- | src/ephy-python.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ephy-python.c b/src/ephy-python.c index 01c255879..12da0d69f 100644 --- a/src/ephy-python.c +++ b/src/ephy-python.c @@ -38,6 +38,7 @@ extern PyMethodDef pyepiphany_functions[]; static guint idle_gc_handler = 0; static guint idle_shutdown_handler = 0; +static gboolean python_initialised = FALSE; void ephy_python_init (void) @@ -46,6 +47,7 @@ ephy_python_init (void) PyObject *m, *d; Py_Initialize(); + python_initialised = TRUE; argv[0] = g_get_prgname (); PySys_SetArgv (1, argv); @@ -74,6 +76,8 @@ idle_shutdown (void) void ephy_python_shutdown (void) { + if (!python_initialised) return; + g_return_if_fail (idle_shutdown_handler == 0); LOG ("EphyPython shutdown with %s GC scheduled", @@ -123,7 +127,7 @@ ephy_python_schedule_gc (void) { /* LOG ("Scheduling a GC with %s GC already scheduled", idle_gc_handler != 0 ? "a" : "no"); */ - if (idle_gc_handler == 0) + if (python_initialised && idle_gc_handler == 0) { idle_gc_handler = g_idle_add ((GSourceFunc) idle_gc, NULL); } |