aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-12-03 23:56:48 +0800
committerChristian Persch <chpe@src.gnome.org>2004-12-03 23:56:48 +0800
commit159c151dd5c79a425b6b3270f2867bde767cbe2a (patch)
treecc4fe71e89db981280cc5eb272c037f4349319fb
parentb517aebcc8201fbf5218a8b5b819ea8d146dc52d (diff)
downloadgsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar.gz
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar.bz2
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar.lz
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar.xz
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.tar.zst
gsoc2013-epiphany-159c151dd5c79a425b6b3270f2867bde767cbe2a.zip
Don't offer to resume if there are open windows. Fixes bug #160345.
2004-12-03 Christian Persch <chpe@cvs.gnome.org> * src/ephy-session.c: (ephy_session_autoresume): Don't offer to resume if there are open windows. Fixes bug #160345.
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-session.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index da35cc9f7..5fbec2c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-12-03 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-session.c: (ephy_session_autoresume):
+
+ Don't offer to resume if there are open windows.
+ Fixes bug #160345.
+
+2004-12-03 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-history-window.c:
Use stock icon for "Open In New Tab".
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 8da52d255..31346004b 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -413,7 +413,7 @@ ephy_session_autoresume (EphySession *session)
LOG ("ephy_session_autoresume")
- if (session->priv->windows != NULL) return FALSE;
+ if (session->priv->windows != NULL || session->priv->tool_windows != NULL) return FALSE;
if (session->priv->resume_dialog)
{