X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-utils.c;h=f56a3a8d0249b7f2d9214221678393da20ee4dcd;hb=43ca21fcab59e7dbff957f512cd57ab06a37236c;hp=1f0938507c685bac93572264663614dc99afae5a;hpb=e3277ea07a5543dcc250f8e60dadb6c51cc3bfb1;p=modest

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 1f09385..f56a3a8 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -857,38 +857,12 @@ modest_utils_open_mcc_mapping_file (void)
 	return result;
 }
 
-/* cluster mcc's, based on the list
- * http://en.wikipedia.org/wiki/Mobile_country_code
- */
-static int
-effective_mcc (gint mcc)
-{
-	switch (mcc) {
-	case 405: return 404; /* india */
-	case 441: return 440; /* japan */	
-	case 235: return 234; /* united kingdom */
-	case 311:
-	case 312:
-	case 313:
-	case 314:
-	case 315:
-	case 316: return 310; /* united states */
-	default:  return mcc;
-	}
-}
-
 /* each line is of the form:
    xxx    logical_id
 
   NOTE: this function is NOT re-entrant, the out-param country
   are static strings that should NOT be freed. and will change when
   calling this function again
-
-  also note, this function will return the "effective mcc", which
-  is the normalized mcc for a country - ie. even if the there
-  are multiple entries for the United States with various mccs,
-  this function will always return 310, even if the real mcc parsed
-  would be 314. see the 'effective_mcc' function above.
 */
 static int
 parse_mcc_mapping_line (const char* line,  char** country)
@@ -925,7 +899,7 @@ parse_mcc_mapping_line (const char* line,  char** country)
 	mcc[2] = g_utf8_get_char (iter);
 	mcc[3] = '\0';
 
-	return effective_mcc ((int) strtol ((const char*)mcc, NULL, 10));
+	return (int) strtol ((const char*)mcc, NULL, 10);
 }
 
 #define MCC_FILE_MAX_LINE_LEN 128 /* max length of a line in MCC file */
@@ -960,7 +934,9 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
 	}
 
 	/* Get the territory specified for the current locale */
-	territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME);
+	territory = nl_langinfo (_NL_IDENTIFICATION_TERRITORY);
+
+	setlocale (LC_MESSAGES, "en_GB");
 
 	while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) {
 		int mcc;
@@ -985,6 +961,8 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
 		}
 	}
 
+	setlocale (LC_MESSAGES, "");
+
 	/* Now we fill the model */
 	rewind (file);
 	country_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);