diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ephy-file-helpers.c | 12 | ||||
| -rw-r--r-- | lib/ephy-file-helpers.h | 4 |
2 files changed, 13 insertions, 3 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) { diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h index 505e609c6..8f9440af9 100644 --- a/lib/ephy-file-helpers.h +++ b/lib/ephy-file-helpers.h @@ -43,7 +43,9 @@ typedef struct _EphyFileMonitor EphyFileMonitor; typedef void (* EphyFileMonitorFunc) (EphyFileMonitor*, const char*, GnomeVFSMonitorEventType, gpointer); typedef gboolean (* EphyFileMonitorDelayFunc) (EphyFileMonitor*, gpointer); -gboolean ephy_file_helpers_init (gboolean private_profile, +gboolean ephy_file_helpers_init (const char *profile_dir, + gboolean private_profile, + gboolean delete_profile_on_exit, GError **error); const char *ephy_file (const char *filename); |