Cherry picked from commits in openismus-work-3-8:
Use separate environment variable to control localed bus, instead of
EDS_TESTING 089526
/* 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 */
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");