diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-12 20:59:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-12 20:59:41 +0800 |
| commit | c4d1d29eaaae6c2668599de0c989f5fe2b189c1e (patch) | |
| tree | 34b6b31bbbdc820418cb0ddff44c681440c21166 /shell/e-shell.c | |
| parent | 10eab2350036e1c36377c93d31472125b3e7c8c7 (diff) | |
| download | gsoc2013-evolution-c4d1d29eaaae6c2668599de0c989f5fe2b189c1e.tar.gz gsoc2013-evolution-c4d1d29eaaae6c2668599de0c989f5fe2b189c1e.tar.zst gsoc2013-evolution-c4d1d29eaaae6c2668599de0c989f5fe2b189c1e.zip | |
Fix a problem with EShell initialization.
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 35908e0855..15aed4303e 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -505,6 +505,10 @@ shell_finalize (GObject *object) static void shell_constructed (GObject *object) { + /* The first EShell instance is the default. */ + if (default_shell == NULL) + default_shell = g_object_ref (object); + /* UniqueApp will have by this point determined whether we're * the only Evolution process running. If so, proceed normally. * Otherwise we just issue commands to the other process. */ @@ -516,11 +520,6 @@ shell_constructed (GObject *object) shell_load_modules (E_SHELL (object)); shell_create_backends (E_SHELL (object)); - /* e_shell_migrate_attempt() leads to code paths that rely on - * e_shell_get_default(), so set the default shell first. */ - if (default_shell == NULL) - default_shell = g_object_ref (object); - e_shell_migrate_attempt (E_SHELL (object)); } |