[evolution-data-server/openismus-work-3-8] addressbook: revert to specific environment variable name



commit c3db199edad37fb3c8bcb5a016635a6e7c52d3a6
Author: alexandru.costache <alexandru costache 100 gmail com>
Date:   Mon Feb 24 18:08:02 2014 +0200

    addressbook: revert to specific environment variable name
    
        Commit "addressbook: fix localed race condition" brought from
        upstream master checks if the environment variable EDS_TESTING
        is set, while the original code used EDS_LOCALED_TESTING.
    
        This patch reverts checking to branch specific name.

 addressbook/libedata-book/e-data-book-factory.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index ca70723..0c4d5e2 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -664,7 +664,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 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]