diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-02-23 13:41:48 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-02-23 13:41:48 +0100 |
| commit | 886b22da5ca8a4f300a74cb04690c8dd9cb26b56 (patch) | |
| tree | bdbf1743e44f46f95ae1c5e8b6d1365caa2cfb96 /services | |
| parent | 696b658a8626bc5b8872363aaeef156d4c9725d4 (diff) | |
| download | evolution-data-server-886b22da5ca8a4f300a74cb04690c8dd9cb26b56.tar.gz | |
Initialize EGdbusTemplates main thread in book/calendar factories
This is needed for 'contacts' calendar backend, to not call main
context iteration when it is run in a dedicated thread, but call
it in both factories, just in case.
Diffstat (limited to 'services')
| -rw-r--r-- | services/evolution-addressbook-factory/evolution-addressbook-factory.c | 3 | ||||
| -rw-r--r-- | services/evolution-calendar-factory/evolution-calendar-factory.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c b/services/evolution-addressbook-factory/evolution-addressbook-factory.c index 477a31ea9..20b9dd481 100644 --- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c +++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c @@ -37,6 +37,7 @@ #endif #include <libedata-book/e-data-book-factory.h> +#include <libedataserver/e-gdbus-templates.h> static gboolean opt_keep_running = FALSE; static gboolean opt_wait_for_client = FALSE; @@ -116,6 +117,8 @@ main (gint argc, /* Migrate user data from ~/.evolution to XDG base directories. */ evolution_addressbook_factory_migrate_basedir (); + e_gdbus_templates_init_main_thread (); + server = e_data_book_factory_new (NULL, &error); if (error != NULL) { diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c b/services/evolution-calendar-factory/evolution-calendar-factory.c index 86648bcfd..eca2915eb 100644 --- a/services/evolution-calendar-factory/evolution-calendar-factory.c +++ b/services/evolution-calendar-factory/evolution-calendar-factory.c @@ -41,6 +41,7 @@ #endif #include <libedata-cal/e-data-cal-factory.h> +#include <libedataserver/e-gdbus-templates.h> static gboolean opt_keep_running = FALSE; static gboolean opt_wait_for_client = FALSE; @@ -124,6 +125,8 @@ main (gint argc, /* Migrate user data from ~/.evolution to XDG base directories. */ evolution_calendar_factory_migrate_basedir (); + e_gdbus_templates_init_main_thread (); + server = e_data_cal_factory_new (NULL, &error); if (error != NULL) { |