2007-04-29 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / easysetup / modest-easysetup-country-combo-box.c

diff --git a/src/maemo/easysetup/modest-easysetup-country-combo-box.c b/src/maemo/easysetup/modest-easysetup-country-combo-box.c
index 511d8d9..5f15bd9 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-country-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-country-combo-box.c
@@ -151,11 +151,11 @@ static void load_from_file (EasysetupCountryComboBox *self)
        EasysetupCountryComboBoxPrivate *priv = COUNTRY_COMBO_BOX_GET_PRIVATE (self);
        
        /* Load the file one line at a time: */
-       const gchar* filepath = "/usr/share/operator-wizard/mcc_mapping";
+       const gchar* filepath = PROVIDER_DATA_DIR "/mcc_mapping";
        FILE *file = fopen(filepath, "r");
        if (!file)
        {
-               const gchar* filepath_hack = "./src/maemo/easysetup/mcc_mapping";
+               const gchar* filepath_hack = HACK_TOP_SRCDIR "src/maemo/easysetup/mcc_mapping";
                g_warning ("Could not locate the official mcc_mapping countries list file from %s, "
                        "so attempting to load it instead from %s", filepath, filepath_hack);
                file = fopen(filepath_hack, "r");