From 9551d47dd1a42d1cce29926957a82238f9514272 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 Feb 2013 18:52:26 -0500 Subject: 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. --- shell/e-shell.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; } -- cgit v1.2.3