diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-13 18:24:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-13 18:24:56 +0800 |
| commit | 2606279995f614634062e0aeb9833c482db5d083 (patch) | |
| tree | 625e6ae5d03052e753c3322397b41f4174ca3926 /src/ephy-shell.c | |
| parent | 79ec35d68d698710604fd4e9682188ae28ba1ae0 (diff) | |
| download | gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.gz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.zst gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.zip | |
Merging pre-gnome-2-10 branch to HEAD.
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
Merging pre-gnome-2-10 branch to HEAD.
Splitting ChangeLog.
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 2718ea538..792099ddd 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -56,7 +56,6 @@ #include <libgnomeui/gnome-client.h> #define AUTOMATION_IID "OAFIID:GNOME_Epiphany_Automation" -#define SERVER_TIMEOUT 60000 #define EPHY_SHELL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SHELL, EphyShellPrivate)) @@ -74,7 +73,6 @@ struct EphyShellPrivate GObject *prefs_dialog; GObject *print_setup_dialog; GList *del_on_exit; - guint server_timeout; }; EphyShell *ephy_shell = NULL; @@ -186,7 +184,6 @@ ephy_shell_init (EphyShell *shell) shell->priv->toolbars_model = NULL; shell->priv->fs_toolbars_model = NULL; shell->priv->extensions_manager = NULL; - shell->priv->server_timeout = 0; /* globally accessible singleton */ g_assert (ephy_shell == NULL); @@ -246,14 +243,6 @@ open_urls (GNOME_EphyAutomation automation, } static gboolean -server_timeout (EphyShell *shell) -{ - g_object_unref (shell); - - return FALSE; -} - -static gboolean save_yourself_cb (GnomeClient *client, gint phase, GnomeSaveStyle save_style, @@ -263,7 +252,7 @@ save_yourself_cb (GnomeClient *client, EphyShell *shell) { char *argv[] = { "epiphany", "--load-session", NULL }; - char *discard_argv[] = { "rm", "-r", NULL }; + char *discard_argv[] = { "rm", "-f", NULL }; EphySession *session; char *tmp, *save_to; @@ -359,13 +348,7 @@ ephy_shell_startup (EphyShell *shell, g_assert_not_reached (); } - if (flags & EPHY_SHELL_STARTUP_SERVER) - { - g_object_ref (shell); - shell->priv->server_timeout = g_timeout_add - (SERVER_TIMEOUT, (GSourceFunc)server_timeout, shell); - } - else if (result == Bonobo_ACTIVATION_REG_SUCCESS || + if (result == Bonobo_ACTIVATION_REG_SUCCESS || result == Bonobo_ACTIVATION_REG_ALREADY_ACTIVE) { automation = bonobo_activation_activate_from_id (AUTOMATION_IID, @@ -428,11 +411,6 @@ ephy_shell_finalize (GObject *object) g_assert (ephy_shell == NULL); - if (shell->priv->server_timeout > 0) - { - g_source_remove (shell->priv->server_timeout); - } - /* this will unload the extensions */ LOG ("Unref extension manager") g_object_unref (shell->priv->extensions_manager); |