[evolution-data-server/intel-work-3-12: 1/4] EDataBook: Use separate environment variable to control localed bus

[Mateusz Polrola <mpolrola src gnome org>]

commit f556ffce1bbcc4852c4cd3bc1c8f79415908be54
Author: Mateusz Polrola <mateusz polrola gmail com>
Date:   Fri May 30 12:03:32 2014 +0200

    EDataBook: Use separate environment variable to control localed bus
    
    Cherry picked from commits in openismus-work-3-8:
    Use separate environment variable to control localed bus, instead of
    EDS_TESTING 089526

 addressbook/libedata-book/e-data-book-factory.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-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 96fb1d4..a451413 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -807,7 +807,7 @@ data_book_factory_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 71cfe81..877031d 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -250,6 +250,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");