diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/ephy-shell.c | 7 |
2 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2004-11-11 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-shell.c: (save_yourself_cb): + + Don't hardcode "epiphany" as argv[0], use g_get_prgname() instead. + Fixes bug #118427. + +2004-11-11 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-session.c: (ephy_session_close): Keep a ref on EphyShell in ephy_session_close(). Otherwise we diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 49befe177..9764430d3 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -239,11 +239,13 @@ save_yourself_cb (GnomeClient *client, gboolean fast, EphyShell *shell) { - char *argv[] = { "epiphany", "--load-session", NULL }; + char *argv[] = { NULL, "--load-session", NULL }; char *discard_argv[] = { "rm", "-f", NULL }; EphySession *session; char *tmp, *save_to; + LOG ("save_yourself_cb") + tmp = g_build_filename (ephy_dot_dir (), "session_gnome-XXXXXX", NULL); @@ -252,6 +254,7 @@ save_yourself_cb (GnomeClient *client, session = EPHY_SESSION (ephy_shell_get_session (shell)); + argv[0] = g_get_prgname (); argv[2] = save_to; gnome_client_set_restart_command (client, 3, argv); @@ -273,6 +276,8 @@ die_cb (GnomeClient* client, { EphySession *session; + LOG ("die_cb") + session = EPHY_SESSION (ephy_shell_get_session (shell)); ephy_session_close (session); } |