diff options
| author | Tristan Van Berkom <tristanvb@openismus.com> | 2013-10-26 22:33:30 +0200 |
|---|---|---|
| committer | Tristan Van Berkom <tristanvb@openismus.com> | 2013-10-26 22:46:30 +0200 |
| commit | 089526e02d2dad69c0526bd3772ba8e6286c8d0f (patch) | |
| tree | bfd2a8f87d8326f9ae934c6ea1f74dde0e1c4e76 | |
| parent | d5988e1474470378ff5cdd4f310f59726a800863 (diff) | |
| download | evolution-data-server-089526e02d2dad69c0526bd3772ba8e6286c8d0f.tar.gz | |
Use separate environment variable to control localed bus, instead of EDS_TESTINGOPENISMUS_3_8_CURSOR_PRE_API_CHANGE
| -rw-r--r-- | addressbook/libedata-book/e-data-book.c | 2 | ||||
| -rw-r--r-- | tests/test-server-utils/e-test-server-utils.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c index b82b49089..ab3c396ee 100644 --- a/addressbook/libedata-book/e-data-book.c +++ b/addressbook/libedata-book/e-data-book.c @@ -2408,7 +2408,7 @@ data_book_initable_init (GInitable *initable, /* When running tests, we pretend to be the "org.freedesktop.locale1" service * on the session bus instead of the real location on the system bus. */ - if (g_getenv ("EDS_TESTING") != NULL) + if (g_getenv ("EDS_LOCALED_TESTING") != NULL) bus_type = G_BUS_TYPE_SESSION; /* Watch system bus for locale change notifications */ diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c index bd1b1e844..c83bc7df5 100644 --- a/tests/test-server-utils/e-test-server-utils.c +++ b/tests/test-server-utils/e-test-server-utils.c @@ -81,6 +81,7 @@ setup_environment (void) g_assert (g_setenv ("EDS_CAMEL_PROVIDER_DIR", EDS_TEST_CAMEL_DIR, TRUE)); g_assert (g_setenv ("GIO_USE_VFS", "local", TRUE)); g_assert (g_setenv ("EDS_TESTING", "1", TRUE)); + g_assert (g_setenv ("EDS_LOCALED_TESTING", "1", TRUE)); g_assert (g_setenv ("GSETTINGS_BACKEND", "memory", TRUE)); g_unsetenv ("DISPLAY"); |