[evolution-data-server/october-code-drop-pre-api-change] Use separate environment variable to control localed bus, instead of EDS_TESTING

[Tristan Van Berkom <tvb src gnome org>]

commit 089526e02d2dad69c0526bd3772ba8e6286c8d0f
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Sat Oct 26 22:33:30 2013 +0200

    Use separate environment variable to control localed bus, instead of EDS_TESTING

 addressbook/libedata-book/e-data-book.c       |    2 +-
 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 b82b490..ab3c396 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 bd1b1e8..c83bc7d 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");