diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-07-04 20:22:41 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-07-04 20:22:41 +0800 |
| commit | 553cf8c4a065086212d22d52715333ee166b85b5 (patch) | |
| tree | 3927b984675f82fd3488def5827247166be9a3e3 /src/ephy-shell.c | |
| parent | 0e935c597fe2e3e00f672b98f77eaebf48660857 (diff) | |
| download | gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar.gz gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar.bz2 gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar.lz gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar.xz gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.tar.zst gsoc2013-epiphany-553cf8c4a065086212d22d52715333ee166b85b5.zip | |
Better fix for bug #151037 to make session shutdown work again. Also fix
2005-07-04 Christian Persch <chpe@cvs.gnome.org>
* embed/downloader-view.c: (remove_download), (prepare_close_cb),
(downloader_view_init), (downloader_view_finalize),
(downloader_view_remove_download), (download_dialog_delete_cb):
* embed/ephy-embed-shell.c: (ephy_embed_shell_prepare_close),
(ephy_embed_shell_class_init):
* embed/ephy-embed-shell.h:
* embed/ephy-favicon-cache.c: (prepare_close_cb),
(ephy_favicon_cache_init), (kill_download):
* embed/mozilla/mozilla-embed-find.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
* embed/mozilla/mozilla-notifiers.h:
* src/ephy-session.c: (ephy_session_init), (ephy_session_dispose),
(ephy_session_autoresume), (close_dialog), (ephy_session_close):
* src/ephy-shell.c: (ephy_shell_startup), (toolwindow_hide_cb):
* src/ephy-window.c: (ephy_window_finalize):
Better fix for bug #151037 to make session shutdown work again.
Also fix session shutdown while resuming, and preserve the session
in this case.
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 4b9bd1993..26eb28a61 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -47,7 +47,6 @@ #include "print-dialog.h" #include "ephy-prefs.h" #include "ephy-gui.h" -#include "ephy-object-helpers.h" #ifdef ENABLE_DBUS #include "ephy-dbus.h" @@ -481,8 +480,13 @@ ephy_shell_startup (EphyShell *shell, "from Bonobo when attempting to locate the automation " "object.")); automation = NULL; + goto done; } - else if (flags & EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR) + + /* init the session manager up here so we can quit while the resume dialogue is on */ + gnome_session_init (shell); + + if (flags & EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR) { GNOME_EphyAutomation_openBookmarksEditorWithStartupId (automation, user_time, &ev); @@ -510,14 +514,10 @@ ephy_shell_startup (EphyShell *shell, flags & EPHY_SHELL_STARTUP_FULLSCREEN); } - if (automation) - { - bonobo_object_release_unref (automation, &ev); - } - - gnome_session_init (shell); + bonobo_object_release_unref (automation, &ev); } +done: CORBA_exception_free (&ev); gdk_notify_startup_complete (); @@ -941,8 +941,7 @@ toolwindow_hide_cb (GtkWidget *widget, EphyShell *es) session = EPHY_SESSION (ephy_shell_get_session (es)); ephy_session_remove_window (ephy_shell->priv->session, GTK_WINDOW (widget)); - - ephy_object_idle_unref (ephy_shell); + g_object_unref (ephy_shell); } GtkWidget * |