diff options
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 9b3a9012e..bfb6d7a4a 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -27,7 +27,6 @@ #include "ephy-bookmarks-import.h" #include "ephy-debug.h" #include "ephy-embed-container.h" -#include "ephy-embed-prefs.h" #include "ephy-embed-utils.h" #include "ephy-file-helpers.h" #include "ephy-gui.h" @@ -223,52 +222,16 @@ static GActionEntry app_normal_mode_entries[] = { { "reopen-closed-tab", reopen_closed_tab, NULL, NULL, NULL }, }; -#ifdef HAVE_WEBKIT2 -static void -ephy_shell_setup_environment (EphyShell *shell) -{ - EphyEmbedShellMode mode = ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (shell)); - char *pid_str; - - pid_str = g_strdup_printf ("%u", getpid ()); - g_setenv ("EPHY_WEB_EXTENSION_ID", pid_str, TRUE); - g_setenv ("EPHY_DOT_DIR", ephy_dot_dir (), TRUE); - if (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (mode)) - g_setenv ("EPHY_PRIVATE_PROFILE", "1", TRUE); - g_free (pid_str); -} -#endif - static void ephy_shell_startup (GApplication* application) { EphyEmbedShellMode mode; -#ifdef HAVE_WEBKIT2 - char *disk_cache_dir; -#endif G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); /* We're not remoting; start our services */ mode = ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (application)); -#ifdef HAVE_WEBKIT2 - ephy_shell_setup_environment (EPHY_SHELL (application)); - /* Set the web extensions dir ASAP before the process is launched */ - webkit_web_context_set_web_extensions_directory (webkit_web_context_get_default (), - EPHY_WEB_EXTENSIONS_DIR); - - /* Disk Cache */ - disk_cache_dir = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (mode) ? - ephy_dot_dir () : g_get_user_cache_dir (), - g_get_prgname (), NULL); - webkit_web_context_set_disk_cache_directory (webkit_web_context_get_default (), - disk_cache_dir); - g_free (disk_cache_dir); -#endif - - ephy_embed_prefs_init (); - if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION) { GtkBuilder *builder; @@ -299,14 +262,6 @@ ephy_shell_startup (GApplication* application) } static void -ephy_shell_shutdown (GApplication* application) -{ - G_APPLICATION_CLASS (ephy_shell_parent_class)->shutdown (application); - - ephy_embed_prefs_shutdown (); -} - -static void session_load_cb (GObject *object, GAsyncResult *result, gpointer user_data) @@ -536,7 +491,6 @@ ephy_shell_class_init (EphyShellClass *klass) object_class->constructed = ephy_shell_constructed; application_class->startup = ephy_shell_startup; - application_class->shutdown = ephy_shell_shutdown; application_class->activate = ephy_shell_activate; application_class->before_emit = ephy_shell_before_emit; application_class->add_platform_data = ephy_shell_add_platform_data; |