aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-17 07:52:26 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-17 07:57:09 +0800
commit9551d47dd1a42d1cce29926957a82238f9514272 (patch)
tree18b4b44bd8034f5bae30aea0edac524f82fedcaf
parent208d779b00a410dc1f1734ad1c8b3ccdc53db3d3 (diff)
downloadgsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar.gz
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar.bz2
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar.lz
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar.xz
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.tar.zst
gsoc2013-evolution-9551d47dd1a42d1cce29926957a82238f9514272.zip
e_shell_load_modules: Explicitly load EClientCache extensions.
EShell's instance of EClientCache gets instantiated before modules are loaded, so explicitly call e_extensible_load_extensions() on the cache after modules are loaded. This requires commit 525fba8 in evolution-data-server to work.
-rw-r--r--shell/e-shell.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 00bcd61226..22ea2702b4 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1305,6 +1305,7 @@ e_shell_get_default (void)
void
e_shell_load_modules (EShell *shell)
{
+ EClientCache *client_cache;
const gchar *module_directory;
GList *list;
@@ -1331,6 +1332,11 @@ e_shell_load_modules (EShell *shell)
g_list_foreach (list, (GFunc) shell_process_backend, shell);
shell->priv->loaded_backends = list;
+ /* XXX The client cache needs extra help loading its extensions,
+ * since it gets instantiated before any modules are loaded. */
+ client_cache = e_shell_get_client_cache (shell);
+ e_extensible_load_extensions (E_EXTENSIBLE (client_cache));
+
shell->priv->modules_loaded = TRUE;
}