aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-11-14 05:39:18 +0800
committerChristian Persch <chpe@src.gnome.org>2004-11-14 05:39:18 +0800
commitbe773bd381ccf824582d19c0f88405dcdbdd90ba (patch)
tree6905c287b8948e72dfe2d1737a3a4bc878303ba3
parent24664b3b9a56643eb383e3db7aa24f7a18bd5979 (diff)
downloadgsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar.gz
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar.bz2
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar.lz
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar.xz
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.tar.zst
gsoc2013-epiphany-be773bd381ccf824582d19c0f88405dcdbdd90ba.zip
Don't save session_crashed.xml while shutting down.
2004-11-13 Christian Persch <chpe@cvs.gnome.org> * src/ephy-session.c: (ephy_session_autoresume), (ephy_session_close), (ephy_session_save): Don't save session_crashed.xml while shutting down.
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-session.c10
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 24c38269a..c79a873ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-11-13 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-session.c: (ephy_session_autoresume),
+ (ephy_session_close), (ephy_session_save):
+
+ Don't save session_crashed.xml while shutting down.
+
+2004-11-13 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
diff --git a/src/ephy-session.c b/src/ephy-session.c
index d5297e285..8da52d255 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -57,7 +57,7 @@ struct EphySessionPrivate
GList *windows;
GList *tool_windows;
GtkWidget *resume_dialog;
- gboolean resuming;
+ gboolean dont_save;
};
#define BOOKMARKS_EDITOR_ID "BookmarksEditor"
@@ -426,9 +426,9 @@ ephy_session_autoresume (EphySession *session)
if (g_file_test (saved_session, G_FILE_TEST_EXISTS)
&& offer_to_resume (session))
{
- session->priv->resuming = TRUE;
+ session->priv->dont_save = TRUE;
retval = ephy_session_load (session, saved_session);
- session->priv->resuming = FALSE;
+ session->priv->dont_save = FALSE;
ephy_session_save (session, SESSION_CRASHED);
}
@@ -448,6 +448,7 @@ ephy_session_close (EphySession *session)
* destroying the windows and destroying the tool windows
*/
g_object_ref (ephy_shell);
+ session->priv->dont_save = TRUE;
windows = ephy_session_get_windows (session);
g_list_foreach (windows, (GFunc) gtk_widget_destroy, NULL);
@@ -457,6 +458,7 @@ ephy_session_close (EphySession *session)
g_list_foreach (windows, (GFunc) gtk_widget_destroy, NULL);
g_list_free (windows);
+ session->priv->dont_save = FALSE;
g_object_unref (ephy_shell);
}
@@ -581,7 +583,7 @@ ephy_session_save (EphySession *session,
char *save_to, *tmp_file;
int ret;
- if (session->priv->resuming)
+ if (session->priv->dont_save)
{
return TRUE;
}