aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ephy-file-helpers.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-02-02 21:31:32 +0800
committerChristian Persch <chpe@src.gnome.org>2006-02-02 21:31:32 +0800
commit4d8b2c6114da0d8b629215a2ca690411d1d71949 (patch)
tree64ed27dc4ebd81a958dea41f97e92e2926ad56b3 /lib/ephy-file-helpers.c
parentcbecc0e54beb04ea9b2094058331237f5362ff48 (diff)
downloadgsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar.gz
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar.bz2
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar.lz
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar.xz
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.tar.zst
gsoc2013-epiphany-4d8b2c6114da0d8b629215a2ca690411d1d71949.zip
Queue commands received from the main and remote instances, and process
2006-02-02 Christian Persch <chpe@cvs.gnome.org> * src/ephy-session.c: (save_yourself_cb), (die_cb), (session_command_free), (session_command_find), (resume_dialog_response_cb), (resume_dialog_weak_ref_cb), (session_command_autoresume), (session_command_open_bookmarks_editor), (session_command_open_uris), (session_command_dispatch), (session_command_queue_next), (session_command_queue_clear), (ephy_session_init), (ephy_session_dispose), (ephy_session_finalize), (ephy_session_close), (ephy_session_load), (ephy_session_get_active_window), (ephy_session_queue_command): * src/ephy-session.h: * src/ephy-main.c: (unref_proxy_reply_cb), (open_urls), (call_dbus_proxy), (queue_commands), (main): Queue commands received from the main and remote instances, and process them after autoresume has completed. Bug #328286. * data/epiphany-service.xml: * lib/ephy-file-helpers.c: (ephy_file_helpers_init): * lib/ephy-file-helpers.h: * src/ephy-activation.c: (session_queue_command), (ephy_activation_load_uri_list), (ephy_activation_load_session), (ephy_activation_open_bookmarks_editor): * src/ephy-activation.h: * src/ephy-dbus.c: * src/ephy-dbus.h: * src/epiphany.defs:
Diffstat (limited to 'lib/ephy-file-helpers.c')
-rw-r--r--lib/ephy-file-helpers.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 1f93225b5..7a40fde5e 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -61,6 +61,7 @@ static GHashTable *files = NULL;
static GHashTable *mime_table = NULL;
static gboolean have_private_profile = FALSE;
+static gboolean delete_profile_on_exit = FALSE;
static char *dot_dir = NULL;
static char *tmp_dir = NULL;
static GList *del_on_exit = NULL;
@@ -257,7 +258,9 @@ ephy_dot_dir (void)
}
gboolean
-ephy_file_helpers_init (gboolean private_profile,
+ephy_file_helpers_init (const char *profile_dir,
+ gboolean private_profile,
+ gboolean delete_profile,
GError **error)
{
const char *uuid;
@@ -281,8 +284,13 @@ ephy_file_helpers_init (gboolean private_profile,
(GDestroyNotify) g_free);
have_private_profile = private_profile;
+ delete_profile_on_exit = delete_profile;
- if (private_profile)
+ if (private_profile && profile_dir != NULL)
+ {
+ dot_dir = g_strdup (profile_dir);
+ }
+ else if (private_profile)
{
if (ephy_file_tmp_dir () == NULL)
{