diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-02 04:52:04 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-02 04:52:04 +0800 |
| commit | 8f0093b0d8c8b45390353243515b7dfb8eeabf93 (patch) | |
| tree | 5c80f5070204837ea418be9af86cda239f4ae58f | |
| parent | e37231b9e13aa8b7c0803a370b5463a9e4f390cb (diff) | |
| download | gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar.gz gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar.bz2 gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar.lz gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar.xz gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.tar.zst gsoc2013-evolution-8f0093b0d8c8b45390353243515b7dfb8eeabf93.zip | |
Start migration -after- loading all modules and plugins.
| -rw-r--r-- | shell/e-shell.c | 3 | ||||
| -rw-r--r-- | shell/main.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 75b66555fc..d2a82675ae 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -30,7 +30,6 @@ #include "widgets/misc/e-preferences-window.h" #include "e-shell-backend.h" -#include "e-shell-migrate.h" #include "e-shell-window.h" #define E_SHELL_GET_PRIVATE(obj) \ @@ -598,8 +597,6 @@ shell_constructed (GObject *object) shell_load_modules (E_SHELL (object)); shell_create_backends (E_SHELL (object)); - - e_shell_migrate_attempt (E_SHELL (object)); } static gboolean diff --git a/shell/main.c b/shell/main.c index 72333c17f7..eadb348d6b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -45,6 +45,7 @@ #include "e-util/e-util.h" #include "e-shell.h" +#include "e-shell-migrate.h" #include "es-event.h" #include "e-util/e-util-private.h" @@ -590,6 +591,10 @@ main (gint argc, gchar **argv) e_plugin_load_plugins (); } + /* Attempt migration -after- loading all modules and plugins, + * as both shell backends and certain plugins hook into this. */ + e_shell_migrate_attempt (default_shell); + gtk_main (); /* Drop what should be the last reference to the shell. |