diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
commit | 1107fea0f8edff76d5956426044c9afe41c387fa (patch) | |
tree | 3140debb1cef6c058425360e0c43b6c55da75f3a /shell | |
parent | ceda5ef420b4a4b97ce0011d49be3f96e857c9ef (diff) | |
parent | 88d5608a97ebaee9c04c3e8ac6b79278e824ecee (diff) | |
download | gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.gz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.bz2 gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.lz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.xz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.zst gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.zip |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'shell')
-rw-r--r-- | shell/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shell/main.c b/shell/main.c index 0b042d4d40..c8ce8a014a 100644 --- a/shell/main.c +++ b/shell/main.c @@ -57,6 +57,7 @@ #include <libxml/tree.h> #include <libedataserver/e-categories.h> +#include <libedataserver/e-gdbus-templates.h> #include <libedataserverui/e-passwords.h> #include "e-shell.h" @@ -514,6 +515,8 @@ main (gint argc, ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN); #endif + e_gdbus_templates_init_main_thread (); + #ifdef G_OS_WIN32 path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); |