diff options
| author | Xan Lopez <xan@src.gnome.org> | 2009-03-13 16:29:48 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2009-03-13 16:29:48 +0800 |
| commit | 2eccee1a93b59ef10709100c83d7dfcc26b87706 (patch) | |
| tree | aa6e265f8cfdc354415565106d66cc0691816d47 /src/ephy-main.c | |
| parent | ac544e0888eece59d80ed9bad42b07661fceefc9 (diff) | |
| download | gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar.gz gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar.bz2 gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar.lz gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar.xz gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.tar.zst gsoc2013-epiphany-2eccee1a93b59ef10709100c83d7dfcc26b87706.zip | |
Add profile migration.
Migrate cookies from Mozilla, both sqlite and txt formats (sqlite has
priority in case both exist).
svn path=/trunk/; revision=8880
Diffstat (limited to 'src/ephy-main.c')
| -rw-r--r-- | src/ephy-main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index 3efd40818..0df019c11 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -32,6 +32,7 @@ #include "ephy-session.h" #include "ephy-shell.h" #include "ephy-prefs.h" +#include "ephy-profile-migration.h" #include "ephy-debug.h" #include "eggsmclient.h" @@ -737,7 +738,6 @@ main (int argc, } /* We're not remoting; start our services */ - if (!ephy_file_helpers_init (profile_directory, private_instance, keep_temp_directory || profile_directory, @@ -750,9 +750,12 @@ main (int argc, exit (1); } + /* Migrate profile */ + _ephy_profile_migrate (); + eel_gconf_monitor_add ("/apps/epiphany/general"); ephy_stock_icons_init (); - load_accels (); + load_accels (); /* Extensions may want these, so don't initialize in window-cmds */ gtk_about_dialog_set_url_hook (handle_url, NULL, NULL); |