From 1ad1801cc3f50d8ce7a1c586ba67cefffc9d0520 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 8 Oct 2003 19:15:24 +0000 Subject: Don't show the session resume dialogue when in server mode. Fixes bug 2003-10-07 Christian Persch * src/ephy-automation.c: (impl_ephy_automation_loadurl): Don't show the session resume dialogue when in server mode. Fixes bug #124042. --- ChangeLog | 7 +++++++ src/ephy-automation.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 67266c573..d1e1ddcab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-10-07 Christian Persch + + * src/ephy-automation.c: (impl_ephy_automation_loadurl): + + Don't show the session resume dialogue when in server mode. + Fixes bug #124042. + 2003-10-03 Christian Persch * Makefile.am: diff --git a/src/ephy-automation.c b/src/ephy-automation.c index 6fd31a07c..d49ba3ac7 100644 --- a/src/ephy-automation.c +++ b/src/ephy-automation.c @@ -98,7 +98,8 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant, session = SESSION (ephy_shell_get_session (ephy_shell)); /* no window open, let's try to autoresume */ - if (session_get_windows (session) == NULL) + if (session_get_windows (session) == NULL + && ephy_shell_get_server_mode (ephy_shell) == FALSE) { gboolean res; res = session_autoresume (session); -- cgit v1.2.3