From: Jose Dapena Paz Date: Wed, 8 Apr 2009 15:42:51 +0000 (+0000) Subject: Move fallback provider data to be in common code. X-Git-Tag: git_migration_finished~107 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=d10a12aaa23f7270c3e30d47ef01469832edc1e7;p=modest Move fallback provider data to be in common code. pmo-trunk-r8699 --- diff --git a/src/Makefile.am b/src/Makefile.am index 775fa65..bc5e920 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -219,8 +219,13 @@ MMC_MAPPING_FILE=mcc_mapping mmccmappingdir=$(datadir)/modest/provider-data mmccmapping_DATA = $(MMC_MAPPING_FILE) +PROVIDER_DATA_FILE=fallback-provider-data.keyfile +providerdatadir=$(datadir)/modest/provider-data +providerdata_DATA = $(PROVIDER_DATA_FILE) + EXTRA_DIST=modest-marshal.list \ - $(MMC_MAPPING_FILE) + $(MMC_MAPPING_FILE) \ + $(PROVIDER_DATA_FILE) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = modest-plugin-1.0.pc diff --git a/src/fallback-provider-data.keyfile b/src/fallback-provider-data.keyfile new file mode 100644 index 0000000..9152172 --- /dev/null +++ b/src/fallback-provider-data.keyfile @@ -0,0 +1,90 @@ +# maemo-provider-data.keyfile -*-mode:sh-*- +# Time-stamp: <2007-12-01 13:39:11 (djcb)> + +# Copyright (c) 2006, Nokia Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the Nokia Corporation nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +[aim.com] +Name=AIM +MCC=0 +Domain=aim.com +OutgoingMailServer=smtp.aim.com +IncomingMailServer=imap.aim.com +IncomingSecurity=0 +MailboxType=imap +[aol.com] +Name=AOL +MCC=0 +Domain=aol.com +OutgoingMailServer=smtp.aol.com +IncomingMailServer=imap.aol.com +IncomingSecurity=0 +MailboxType=imap +[imap.gmail.com] +Name=Gmail/IMAP +MCC=0 +Domain=gmail.com +OutgoingMailServer=smtp.gmail.com +SecureSmtp=true +IncomingMailServer=imap.gmail.com +IncomingSecurity=2 +MailboxType=imap +[pop.gmail.com] +Name=Gmail/POP3 +MCC=0 +Domain=gmail.com +OutgoingMailServer=smtp.gmail.com +SecureSmtp=true +IncomingMailServer=pop.gmail.com +IncomingSecurity=2 +MailboxType=pop +[lycos.com] +Name=Lycos Mail +MCC=0 +Domain=lycos.com +OutgoingMailServer=smtp.mail.lycos.com +IncomingMailServer=pop.mail.lycos.com +IncomingSecurity=0 +MailboxType=pop +[yahoo.com] +Name=Yahoo Mail Plus +MCC=0 +Domain=yahoo.com +OutgoingMailServer=smtp.mail.yahoo.com +IncomingMailServer=pop.mail.yahoo.com +IncomingSecurity=0 +MailboxType=pop +[Tinymail] +Name=Tinymail +MCC=206 +Domain=tinymail.org +IncomingMailServer=imap1.tinymail.org +IncomingSecurity=0 +MailboxType=imap + diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am index 526e158..e078600 100644 --- a/src/hildon2/Makefile.am +++ b/src/hildon2/Makefile.am @@ -134,15 +134,10 @@ desktopentry_DATA = modest.desktop backupsettings_DATA = modest.conf ossocudscripts_SCRIPTS = modest-clean.sh -PROVIDER_DATA_FILE=maemo-provider-data.keyfile -providerdatadir=$(datadir)/modest/provider-data -providerdata_DATA = $(PROVIDER_DATA_FILE) - EXTRA_DIST=\ $(UI_FILES) \ $(PIXMAP_FILES) \ $(serviceentry_DATA) \ $(desktopentry_DATA) \ $(backupsettings_DATA) \ - $(ossocudscripts_SCRIPTS) \ - $(PROVIDER_DATA_FILE) + $(ossocudscripts_SCRIPTS) \ No newline at end of file diff --git a/src/hildon2/maemo-provider-data.keyfile b/src/hildon2/maemo-provider-data.keyfile deleted file mode 100644 index 9152172..0000000 --- a/src/hildon2/maemo-provider-data.keyfile +++ /dev/null @@ -1,90 +0,0 @@ -# maemo-provider-data.keyfile -*-mode:sh-*- -# Time-stamp: <2007-12-01 13:39:11 (djcb)> - -# Copyright (c) 2006, Nokia Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the Nokia Corporation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -[aim.com] -Name=AIM -MCC=0 -Domain=aim.com -OutgoingMailServer=smtp.aim.com -IncomingMailServer=imap.aim.com -IncomingSecurity=0 -MailboxType=imap -[aol.com] -Name=AOL -MCC=0 -Domain=aol.com -OutgoingMailServer=smtp.aol.com -IncomingMailServer=imap.aol.com -IncomingSecurity=0 -MailboxType=imap -[imap.gmail.com] -Name=Gmail/IMAP -MCC=0 -Domain=gmail.com -OutgoingMailServer=smtp.gmail.com -SecureSmtp=true -IncomingMailServer=imap.gmail.com -IncomingSecurity=2 -MailboxType=imap -[pop.gmail.com] -Name=Gmail/POP3 -MCC=0 -Domain=gmail.com -OutgoingMailServer=smtp.gmail.com -SecureSmtp=true -IncomingMailServer=pop.gmail.com -IncomingSecurity=2 -MailboxType=pop -[lycos.com] -Name=Lycos Mail -MCC=0 -Domain=lycos.com -OutgoingMailServer=smtp.mail.lycos.com -IncomingMailServer=pop.mail.lycos.com -IncomingSecurity=0 -MailboxType=pop -[yahoo.com] -Name=Yahoo Mail Plus -MCC=0 -Domain=yahoo.com -OutgoingMailServer=smtp.mail.yahoo.com -IncomingMailServer=pop.mail.yahoo.com -IncomingSecurity=0 -MailboxType=pop -[Tinymail] -Name=Tinymail -MCC=206 -Domain=tinymail.org -IncomingMailServer=imap1.tinymail.org -IncomingSecurity=0 -MailboxType=imap - diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index b47332d..bd84fdb 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -1263,7 +1263,7 @@ presets_loader (gpointer userdata) const gchar* path = NULL; const gchar* path1 = MODEST_PROVIDER_DATA_FILE; - const gchar* path2 = MODEST_MAEMO_PROVIDER_DATA_FILE; + const gchar* path2 = MODEST_FALLBACK_PROVIDER_DATA_FILE; if (access(path1, R_OK) == 0) path = path1; diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 6caa2d8..e8fc6a8 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -140,7 +140,7 @@ check_required_files (void) fclose (mcc_file); if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 && - access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) { + access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) { g_printerr ("modest: cannot find providers data\n"); return FALSE; } diff --git a/src/maemo/easysetup/Makefile.am b/src/maemo/easysetup/Makefile.am index be47377..daa9ca5 100644 --- a/src/maemo/easysetup/Makefile.am +++ b/src/maemo/easysetup/Makefile.am @@ -60,9 +60,3 @@ LDADD = \ $(MODEST_GSTUFF_LIBS) \ $(MODEST_PLATFORM_LIBS) -PROVIDER_DATA_FILE=maemo-provider-data.keyfile -providerdatadir=$(datadir)/modest/provider-data -providerdata_DATA = $(PROVIDER_DATA_FILE) - -EXTRA_DIST=\ - $(PROVIDER_DATA_FILE) diff --git a/src/maemo/easysetup/maemo-provider-data.keyfile b/src/maemo/easysetup/maemo-provider-data.keyfile deleted file mode 100644 index 9152172..0000000 --- a/src/maemo/easysetup/maemo-provider-data.keyfile +++ /dev/null @@ -1,90 +0,0 @@ -# maemo-provider-data.keyfile -*-mode:sh-*- -# Time-stamp: <2007-12-01 13:39:11 (djcb)> - -# Copyright (c) 2006, Nokia Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the Nokia Corporation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -[aim.com] -Name=AIM -MCC=0 -Domain=aim.com -OutgoingMailServer=smtp.aim.com -IncomingMailServer=imap.aim.com -IncomingSecurity=0 -MailboxType=imap -[aol.com] -Name=AOL -MCC=0 -Domain=aol.com -OutgoingMailServer=smtp.aol.com -IncomingMailServer=imap.aol.com -IncomingSecurity=0 -MailboxType=imap -[imap.gmail.com] -Name=Gmail/IMAP -MCC=0 -Domain=gmail.com -OutgoingMailServer=smtp.gmail.com -SecureSmtp=true -IncomingMailServer=imap.gmail.com -IncomingSecurity=2 -MailboxType=imap -[pop.gmail.com] -Name=Gmail/POP3 -MCC=0 -Domain=gmail.com -OutgoingMailServer=smtp.gmail.com -SecureSmtp=true -IncomingMailServer=pop.gmail.com -IncomingSecurity=2 -MailboxType=pop -[lycos.com] -Name=Lycos Mail -MCC=0 -Domain=lycos.com -OutgoingMailServer=smtp.mail.lycos.com -IncomingMailServer=pop.mail.lycos.com -IncomingSecurity=0 -MailboxType=pop -[yahoo.com] -Name=Yahoo Mail Plus -MCC=0 -Domain=yahoo.com -OutgoingMailServer=smtp.mail.yahoo.com -IncomingMailServer=pop.mail.yahoo.com -IncomingSecurity=0 -MailboxType=pop -[Tinymail] -Name=Tinymail -MCC=206 -Domain=tinymail.org -IncomingMailServer=imap1.tinymail.org -IncomingSecurity=0 -MailboxType=imap - diff --git a/src/maemo/easysetup/mcc_mapping b/src/maemo/easysetup/mcc_mapping deleted file mode 100644 index 6b984d1..0000000 --- a/src/maemo/easysetup/mcc_mapping +++ /dev/null @@ -1,230 +0,0 @@ -412 osso_db_country_afghanistan -276 osso_db_country_albania -603 osso_db_country_algeria -544 osso_db_country_american_samoa -213 osso_db_country_andorra -631 osso_db_country_angola -365 osso_db_country_anguilla -344 osso_db_country_antigua_and_barbuda -722 osso_db_country_argentina -283 osso_db_country_armenia -363 osso_db_country_aruba -505 osso_db_country_australia -232 osso_db_country_austria -400 osso_db_country_azerbaijani_republic -364 osso_db_country_bahamas -426 osso_db_country_bahrain -470 osso_db_country_bangladesh -342 osso_db_country_barbados -257 osso_db_country_belarus -206 osso_db_country_belgium -702 osso_db_country_belize -616 osso_db_country_benin -350 osso_db_country_bermuda -402 osso_db_country_bhutan -736 osso_db_country_bolivia -218 osso_db_country_bosnia_and_herzegovina -652 osso_db_country_botswana -724 osso_db_country_brazil -348 osso_db_country_british_virgin_islands -528 osso_db_country_brunei_darussalam -284 osso_db_country_bulgaria -613 osso_db_country_burkina_faso -642 osso_db_country_burundi -456 osso_db_country_cambodia -624 osso_db_country_cameroon -302 osso_db_country_canada -625 osso_db_country_cape_verde -346 osso_db_country_cayman_islands -623 osso_db_country_central_african_republic -622 osso_db_country_chad -730 osso_db_country_chile -461 osso_db_country_china -460 osso_db_country_china -732 osso_db_country_colombia -654 osso_db_country_comoros -629 osso_db_country_republic_of_the_congo -548 osso_db_country_cook_islands -712 osso_db_country_costa_rica -612 osso_db_country_cote_dlvoire -219 osso_db_country_croatia -368 osso_db_country_cuba -280 osso_db_country_cyprus -230 osso_db_country_czech_republic -630 osso_db_country_democratic_republic_of_the_congo -238 osso_db_country_denmark -638 osso_db_country_djibouti -366 osso_db_country_dominica -370 osso_db_country_dominican_republic -514 osso_db_country_east_timor -740 osso_db_country_ecuador -602 osso_db_country_egypt -706 osso_db_country_el_salvador -627 osso_db_country_equatorial_guinea -657 osso_db_country_eritrea -248 osso_db_country_estonia -636 osso_db_country_ethiopia -288 osso_db_country_faroe_islands -542 osso_db_country_fiji -244 osso_db_country_finland -208 osso_db_country_france -742 osso_db_country_french_guiana -547 osso_db_country_french_polynesia -628 osso_db_country_gobonese_republic -607 osso_db_country_gambia -282 osso_db_country_georgia -262 osso_db_country_germany -620 osso_db_country_ghana -266 osso_db_country_gibraltar -202 osso_db_country_greece -290 osso_db_country_greenland -352 osso_db_country_grenada -340 osso_db_country_guadeloupe -535 osso_db_country_guam -704 osso_db_country_guatemala -611 osso_db_country_guinea -632 osso_db_country_guinea_bissaus -738 osso_db_country_guyana -372 osso_db_country_haiti -708 osso_db_country_honduras -454 osso_db_country_hong_kong -216 osso_db_country_hungary -274 osso_db_country_iceland -404 osso_db_country_india -510 osso_db_country_indonesia -432 osso_db_country_iran -418 osso_db_country_iraq -272 osso_db_country_republic_of_ireland -425 osso_db_country_israel -222 osso_db_country_italy -338 osso_db_country_jamaica -441 osso_db_country_japan -440 osso_db_country_japan -416 osso_db_country_jordan -401 osso_db_country_kazakhstan -639 osso_db_country_kenya -545 osso_db_country_kiribati -467 osso_db_country_korea_north -450 osso_db_country_country_south_korea -419 osso_db_country_kuwait -437 osso_db_country_kyrgyz_republic -457 osso_db_country_laos -247 osso_db_country_latvia -415 osso_db_country_lebanon -651 osso_db_country_lesotho -618 osso_db_country_liberia -606 osso_db_country_libya -295 osso_db_country_liechtenstein -246 osso_db_country_lithuania -270 osso_db_country_luxembourg -455 osso_db_country_macao -294 osso_db_country_the_former_yugoslav_republic_of_macedonia -646 osso_db_country_madagascar -650 osso_db_country_malawi -502 osso_db_country_malaysia -472 osso_db_country_maldives -610 osso_db_country_mali -278 osso_db_country_malta -551 osso_db_country_marshall_islands -340 osso_db_country_martinique -609 osso_db_country_mauritania -617 osso_db_country_mauritius -334 osso_db_country_mexico -550 osso_db_country_micronesia -259 osso_db_country_republic_of_moldova -212 osso_db_country_monaco -428 osso_db_country_mongolia -354 osso_db_country_montserrat -604 osso_db_country_morocco -643 osso_db_country_mozambique -414 osso_db_country_myanmar -649 osso_db_country_namibia -536 osso_db_country_nauru -429 osso_db_country_nepal -204 osso_db_country_netherlands -362 osso_db_country_netherlands_antilles -546 osso_db_country_new_caledonia -530 osso_db_country_new_zealand -710 osso_db_country_nicaraqua -614 osso_db_country_niger -621 osso_db_country_nigeria -534 osso_db_country_northern_mariana_islands -242 osso_db_country_norway -422 osso_db_country_oman -410 osso_db_country_pakistan -552 osso_db_country_palau -714 osso_db_country_panama -537 osso_db_country_papua_new_guinea -744 osso_db_country_paraquay -716 osso_db_country_peru -515 osso_db_country_philippines -260 osso_db_country_poland -268 osso_db_country_portugal -330 osso_db_country_puerto_rico -427 osso_db_country_qatar -647 osso_db_country_reunion -226 osso_db_country_romania -250 osso_db_country_russian_federation -635 osso_db_country_rwandese_republic -356 osso_db_country_saint_kitts_and_nevis -358 osso_db_country_saint_lucia -308 osso_db_country_saint_pierre_and_miquelon -360 osso_db_country_saint_vincent_and_grenadines -549 osso_db_country_samoa -292 osso_db_country_san_marino -626 osso_db_country_sao_tome_and_principe -420 osso_db_country_saudi_arabia -608 osso_db_country_senegal -220 osso_db_country_serbia_and_montenegro -633 osso_db_country_seychelles -619 osso_db_country_sierra_leone -525 osso_db_country_singapore -231 osso_db_country_slovakia -293 osso_db_country_slovenia -540 osso_db_country_solomon_islands -637 osso_db_country_somalia -655 osso_db_country_south_africa -214 osso_db_country_spain -413 osso_db_country_sri_lanka -634 osso_db_country_sudan -746 osso_db_country_suriname -653 osso_db_country_swaziland -240 osso_db_country_sweden -228 osso_db_country_switzerland -417 osso_db_country_syrian_arab_republic -466 osso_db_country_taiwan -436 osso_db_country_tajikistan -640 osso_db_country_united_republic_of_tanzania -520 osso_db_country_thailand -615 osso_db_country_togolese_republic -539 osso_db_country_tonga -374 osso_db_country_trinidad_and_tobago -605 osso_db_country_tunisia -286 osso_db_country_turkey -438 osso_db_country_turkmenistan -376 osso_db_country_turks_and_caicos_islands -641 osso_db_country_uganda -255 osso_db_country_ukraine -424 osso_db_country_united_arab_emirates -430 osso_db_country_united_arab_emirates_abu_dhabi -431 osso_db_country_united_arab_emirates_dubai -235 osso_db_country_united_kingdom_of_great_britain_and_northern_ireland -234 osso_db_country_united_kingdom_of_great_britain_and_northern_ireland -310 osso_db_country_united_states_of_america -316 osso_db_country_united_states_of_america -311 osso_db_country_united_states_of_america -312 osso_db_country_united_states_of_america -313 osso_db_country_united_states_of_america -314 osso_db_country_united_states_of_america -315 osso_db_country_united_states_of_america -332 osso_db_country_unites_states_virgin_islands -748 osso_db_country_uruguay -434 osso_db_country_uzbekistan -541 osso_db_country_vanuatu -225 osso_db_country_the_vatican -734 osso_db_country_venezuela -452 osso_db_country_viet_nam -543 osso_db_country_wallis_and_futuna -421 osso_db_country_yemen -645 osso_db_country_zambia -648 osso_db_country_zimbabwe diff --git a/src/maemo/easysetup/mcc_mapping.en_GB b/src/maemo/easysetup/mcc_mapping.en_GB deleted file mode 100644 index 491e504..0000000 --- a/src/maemo/easysetup/mcc_mapping.en_GB +++ /dev/null @@ -1,107 +0,0 @@ -276 Albania -213 Andorra -722 Argentina -363 Aruba -505 Australia -232 Austria -400 Azerbaijan -426 Bahrain -470 Bangladesh -257 Belarus -206 Belgium -736 Bolivia -218 Bosnia and Herzegovina -652 Botswana -724 Brazil -528 Brunei Darussalam -284 Bulgaria -456 Cambodia -302 Canada -730 Chile -460 China -732 Colombia -219 Croatia -280 Cyprus -230 Czech Republic -238 Denmark -370 Dominican Republic -740 Ecuador -602 Egypt -706 El Salvador -248 Estonia -244 Finland -208 France -282 Georgia -262 Germany -620 Ghana -266 Gibraltar -202 Greece -340 Guadeloupe -704 Guatemala -708 Honduras -454 Hong Kong, China -216 Hungary -274 Iceland -404 India -510 Indonesia -272 Ireland -425 Israel -222 Italy -338 Jamaica -440 Japan -416 Jordan -401 Kazakhstan -639 Kenya -419 Kuwait -247 Latvia -415 Lebanon -295 Liechtenstein -246 Lithuania -270 Luxembourg -455 Macao, China -294 Macedonia -502 Malaysia -472 Maldives -278 Malta -340 Martinique -334 Mexico -259 Moldova -212 Monaco -428 Mongolia -220 Montenegro -604 Morocco -204 Netherlands -530 New Zealand -621 Nigeria -242 Norway -422 Oman -410 Pakistan -714 Panama -744 Paraguay -716 Peru -515 Philippines -260 Poland -268 Portugal -427 Qatar -226 Romania -250 Russian Federation -420 Saudi Arabia -220 Serbia -525 Singapore -231 Slovakia -293 Slovenia -655 South Africa -214 Spain -413 Sri Lanka -240 Sweden -228 Switzerland -417 Syria -466 Taiwan -520 Thailand -374 Trinidad and Tobago -286 Turkey -255 Ukraine -234 United Kingdom -748 Uruguay -310 USA -734 Venezuela diff --git a/src/maemo/easysetup/modest-easysetup-wizard-dialog.c b/src/maemo/easysetup/modest-easysetup-wizard-dialog.c index 12efd24..ef5f7ad 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard-dialog.c +++ b/src/maemo/easysetup/modest-easysetup-wizard-dialog.c @@ -1176,7 +1176,7 @@ presets_loader (gpointer userdata) const gchar* path = NULL; const gchar* path1 = MODEST_PROVIDER_DATA_FILE; - const gchar* path2 = MODEST_MAEMO_PROVIDER_DATA_FILE; + const gchar* path2 = MODEST_FALLBACK_PROVIDER_DATA_FILE; if (access(path1, R_OK) == 0) path = path1; diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 5472fbe..344c567 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -110,7 +110,7 @@ check_required_files (void) fclose (mcc_file); if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 && - access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) { + access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) { g_printerr ("modest: cannot find providers data\n"); return FALSE; } diff --git a/src/modest-defs.h b/src/modest-defs.h index 18ac528..5772952 100644 --- a/src/modest-defs.h +++ b/src/modest-defs.h @@ -87,7 +87,7 @@ const gchar *modest_defs_namespace (const gchar *string); #define MODEST_OPERATOR_WIZARD_MCC_MAPPING "/usr/share/operator-wizard/mcc_mapping" #define MODEST_PROVIDER_DATA_FILE PREFIX "/share/modest/provider-data/modest-provider-data.keyfile" -#define MODEST_MAEMO_PROVIDER_DATA_FILE PREFIX "/share/modest/provider-data/maemo-provider-data.keyfile" +#define MODEST_FALLBACK_PROVIDER_DATA_FILE PREFIX "/share/modest/provider-data/fallback-provider-data.keyfile" #ifndef MODEST_TOOLKIT_GTK