casa-mp-base

--- src/addressbook/libebook-contacts/e-phone-number-private.cpp.orig   2014-11-19 05:53:26.000000000 -0800

+++ src/addressbook/libebook-contacts/e-phone-number-private.cpp    2014-11-28 13:09:52.000000000 -0800

@@ -118,9 +118,13 @@

    /* Extract two-letter country code from current locale id if needed.

     * From outside this is a C library, so we better consult the

          * C infrastructure instead of std::locale, which might divert. */

-   if (region_code == NULL || region_code[0] == '\0')

+   if (region_code == NULL || region_code[0] == '\0') {

+#ifdef LC_ADDRESS

        return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ADDRESS, NULL));

-

+#else

+       return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ALL, NULL));

+#endif

+        }

    return region_code;

 }