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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
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 (file)
index 6b984d1..0000000
--- a/src/maemo/easysetup/mcc_mapping
+++ /dev/null
@@ -1,230 +0,0 @@
-412    osso_db_country_afghanistan\r
-276    osso_db_country_albania\r
-603    osso_db_country_algeria\r
-544    osso_db_country_american_samoa\r
-213    osso_db_country_andorra\r
-631    osso_db_country_angola\r
-365    osso_db_country_anguilla\r
-344    osso_db_country_antigua_and_barbuda\r
-722    osso_db_country_argentina\r
-283    osso_db_country_armenia\r
-363    osso_db_country_aruba\r
-505    osso_db_country_australia\r
-232    osso_db_country_austria\r
-400    osso_db_country_azerbaijani_republic\r
-364    osso_db_country_bahamas\r
-426    osso_db_country_bahrain\r
-470    osso_db_country_bangladesh\r
-342    osso_db_country_barbados\r
-257    osso_db_country_belarus\r
-206    osso_db_country_belgium\r
-702    osso_db_country_belize\r
-616    osso_db_country_benin\r
-350    osso_db_country_bermuda\r
-402    osso_db_country_bhutan\r
-736    osso_db_country_bolivia\r
-218    osso_db_country_bosnia_and_herzegovina\r
-652    osso_db_country_botswana\r
-724    osso_db_country_brazil\r
-348    osso_db_country_british_virgin_islands\r
-528    osso_db_country_brunei_darussalam\r
-284    osso_db_country_bulgaria\r
-613    osso_db_country_burkina_faso\r
-642    osso_db_country_burundi\r
-456    osso_db_country_cambodia\r
-624    osso_db_country_cameroon\r
-302    osso_db_country_canada\r
-625    osso_db_country_cape_verde\r
-346    osso_db_country_cayman_islands\r
-623    osso_db_country_central_african_republic\r
-622    osso_db_country_chad\r
-730    osso_db_country_chile\r
-461    osso_db_country_china\r
-460    osso_db_country_china\r
-732    osso_db_country_colombia\r
-654    osso_db_country_comoros\r
-629    osso_db_country_republic_of_the_congo\r
-548    osso_db_country_cook_islands\r
-712    osso_db_country_costa_rica\r
-612    osso_db_country_cote_dlvoire\r
-219    osso_db_country_croatia\r
-368    osso_db_country_cuba\r
-280    osso_db_country_cyprus\r
-230    osso_db_country_czech_republic\r
-630    osso_db_country_democratic_republic_of_the_congo\r
-238    osso_db_country_denmark\r
-638    osso_db_country_djibouti\r
-366    osso_db_country_dominica\r
-370    osso_db_country_dominican_republic\r
-514    osso_db_country_east_timor\r
-740    osso_db_country_ecuador\r
-602    osso_db_country_egypt\r
-706    osso_db_country_el_salvador\r
-627    osso_db_country_equatorial_guinea\r
-657    osso_db_country_eritrea\r
-248    osso_db_country_estonia\r
-636    osso_db_country_ethiopia\r
-288    osso_db_country_faroe_islands\r
-542    osso_db_country_fiji\r
-244    osso_db_country_finland\r
-208    osso_db_country_france\r
-742    osso_db_country_french_guiana\r
-547    osso_db_country_french_polynesia\r
-628    osso_db_country_gobonese_republic\r
-607    osso_db_country_gambia\r
-282    osso_db_country_georgia\r
-262    osso_db_country_germany\r
-620    osso_db_country_ghana\r
-266    osso_db_country_gibraltar\r
-202    osso_db_country_greece\r
-290    osso_db_country_greenland\r
-352    osso_db_country_grenada\r
-340    osso_db_country_guadeloupe\r
-535    osso_db_country_guam\r
-704    osso_db_country_guatemala\r
-611    osso_db_country_guinea\r
-632    osso_db_country_guinea_bissaus\r
-738    osso_db_country_guyana\r
-372    osso_db_country_haiti\r
-708    osso_db_country_honduras\r
-454    osso_db_country_hong_kong\r
-216    osso_db_country_hungary\r
-274    osso_db_country_iceland\r
-404    osso_db_country_india\r
-510    osso_db_country_indonesia\r
-432    osso_db_country_iran\r
-418    osso_db_country_iraq\r
-272    osso_db_country_republic_of_ireland\r
-425    osso_db_country_israel\r
-222    osso_db_country_italy\r
-338    osso_db_country_jamaica\r
-441    osso_db_country_japan\r
-440    osso_db_country_japan\r
-416    osso_db_country_jordan\r
-401    osso_db_country_kazakhstan\r
-639    osso_db_country_kenya\r
-545    osso_db_country_kiribati\r
-467    osso_db_country_korea_north\r
-450    osso_db_country_country_south_korea\r
-419    osso_db_country_kuwait\r
-437    osso_db_country_kyrgyz_republic\r
-457    osso_db_country_laos\r
-247    osso_db_country_latvia\r
-415    osso_db_country_lebanon\r
-651    osso_db_country_lesotho\r
-618    osso_db_country_liberia\r
-606    osso_db_country_libya\r
-295    osso_db_country_liechtenstein\r
-246    osso_db_country_lithuania\r
-270    osso_db_country_luxembourg\r
-455    osso_db_country_macao\r
-294    osso_db_country_the_former_yugoslav_republic_of_macedonia\r
-646    osso_db_country_madagascar\r
-650    osso_db_country_malawi\r
-502    osso_db_country_malaysia\r
-472    osso_db_country_maldives\r
-610    osso_db_country_mali\r
-278    osso_db_country_malta\r
-551    osso_db_country_marshall_islands\r
-340    osso_db_country_martinique\r
-609    osso_db_country_mauritania\r
-617    osso_db_country_mauritius\r
-334    osso_db_country_mexico\r
-550    osso_db_country_micronesia\r
-259    osso_db_country_republic_of_moldova\r
-212    osso_db_country_monaco\r
-428    osso_db_country_mongolia\r
-354    osso_db_country_montserrat\r
-604    osso_db_country_morocco\r
-643    osso_db_country_mozambique\r
-414    osso_db_country_myanmar\r
-649    osso_db_country_namibia\r
-536    osso_db_country_nauru\r
-429    osso_db_country_nepal\r
-204    osso_db_country_netherlands\r
-362    osso_db_country_netherlands_antilles\r
-546    osso_db_country_new_caledonia\r
-530    osso_db_country_new_zealand\r
-710    osso_db_country_nicaraqua\r
-614    osso_db_country_niger\r
-621    osso_db_country_nigeria\r
-534    osso_db_country_northern_mariana_islands\r
-242    osso_db_country_norway\r
-422    osso_db_country_oman\r
-410    osso_db_country_pakistan\r
-552    osso_db_country_palau\r
-714    osso_db_country_panama\r
-537    osso_db_country_papua_new_guinea\r
-744    osso_db_country_paraquay\r
-716    osso_db_country_peru\r
-515    osso_db_country_philippines\r
-260    osso_db_country_poland\r
-268    osso_db_country_portugal\r
-330    osso_db_country_puerto_rico\r
-427    osso_db_country_qatar\r
-647    osso_db_country_reunion\r
-226    osso_db_country_romania\r
-250    osso_db_country_russian_federation\r
-635    osso_db_country_rwandese_republic\r
-356    osso_db_country_saint_kitts_and_nevis\r
-358    osso_db_country_saint_lucia\r
-308    osso_db_country_saint_pierre_and_miquelon\r
-360    osso_db_country_saint_vincent_and_grenadines\r
-549    osso_db_country_samoa\r
-292    osso_db_country_san_marino\r
-626    osso_db_country_sao_tome_and_principe\r
-420    osso_db_country_saudi_arabia\r
-608    osso_db_country_senegal\r
-220    osso_db_country_serbia_and_montenegro\r
-633    osso_db_country_seychelles\r
-619    osso_db_country_sierra_leone\r
-525    osso_db_country_singapore\r
-231    osso_db_country_slovakia\r
-293    osso_db_country_slovenia\r
-540    osso_db_country_solomon_islands\r
-637    osso_db_country_somalia\r
-655    osso_db_country_south_africa\r
-214    osso_db_country_spain\r
-413    osso_db_country_sri_lanka\r
-634    osso_db_country_sudan\r
-746    osso_db_country_suriname\r
-653    osso_db_country_swaziland\r
-240    osso_db_country_sweden\r
-228    osso_db_country_switzerland\r
-417    osso_db_country_syrian_arab_republic\r
-466    osso_db_country_taiwan\r
-436    osso_db_country_tajikistan\r
-640    osso_db_country_united_republic_of_tanzania\r
-520    osso_db_country_thailand\r
-615    osso_db_country_togolese_republic\r
-539    osso_db_country_tonga\r
-374    osso_db_country_trinidad_and_tobago\r
-605    osso_db_country_tunisia\r
-286    osso_db_country_turkey\r
-438    osso_db_country_turkmenistan\r
-376    osso_db_country_turks_and_caicos_islands\r
-641    osso_db_country_uganda\r
-255    osso_db_country_ukraine\r
-424    osso_db_country_united_arab_emirates\r
-430    osso_db_country_united_arab_emirates_abu_dhabi\r
-431    osso_db_country_united_arab_emirates_dubai\r
-235    osso_db_country_united_kingdom_of_great_britain_and_northern_ireland\r
-234    osso_db_country_united_kingdom_of_great_britain_and_northern_ireland\r
-310    osso_db_country_united_states_of_america\r
-316    osso_db_country_united_states_of_america\r
-311    osso_db_country_united_states_of_america\r
-312    osso_db_country_united_states_of_america\r
-313    osso_db_country_united_states_of_america\r
-314    osso_db_country_united_states_of_america\r
-315    osso_db_country_united_states_of_america\r
-332    osso_db_country_unites_states_virgin_islands\r
-748    osso_db_country_uruguay\r
-434    osso_db_country_uzbekistan\r
-541    osso_db_country_vanuatu\r
-225    osso_db_country_the_vatican\r
-734    osso_db_country_venezuela\r
-452    osso_db_country_viet_nam\r
-543    osso_db_country_wallis_and_futuna\r
-421    osso_db_country_yemen\r
-645    osso_db_country_zambia\r
-648    osso_db_country_zimbabwe\r

diff --git a/src/maemo/easysetup/mcc_mapping.en_GB b/src/maemo/easysetup/mcc_mapping.en_GB
deleted file mode 100644 (file)
index 491e504..0000000
--- a/src/maemo/easysetup/mcc_mapping.en_GB
+++ /dev/null
@@ -1,107 +0,0 @@
-276    Albania\r
-213    Andorra\r
-722    Argentina\r
-363    Aruba\r
-505    Australia\r
-232    Austria\r
-400    Azerbaijan\r
-426    Bahrain\r
-470    Bangladesh\r
-257    Belarus\r
-206    Belgium\r
-736    Bolivia\r
-218    Bosnia and Herzegovina\r
-652    Botswana\r
-724    Brazil\r
-528    Brunei Darussalam\r
-284    Bulgaria\r
-456    Cambodia\r
-302    Canada\r
-730    Chile\r
-460    China\r
-732    Colombia\r
-219    Croatia\r
-280    Cyprus\r
-230    Czech Republic\r
-238    Denmark\r
-370    Dominican Republic\r
-740    Ecuador\r
-602    Egypt\r
-706    El Salvador\r
-248    Estonia\r
-244    Finland\r
-208    France\r
-282    Georgia\r
-262    Germany\r
-620    Ghana\r
-266    Gibraltar\r
-202    Greece\r
-340    Guadeloupe\r
-704    Guatemala\r
-708    Honduras\r
-454    Hong Kong, China\r
-216    Hungary\r
-274    Iceland\r
-404    India\r
-510    Indonesia\r
-272    Ireland\r
-425    Israel\r
-222    Italy\r
-338    Jamaica\r
-440    Japan\r
-416    Jordan\r
-401    Kazakhstan\r
-639    Kenya\r
-419    Kuwait\r
-247    Latvia\r
-415    Lebanon\r
-295    Liechtenstein\r
-246    Lithuania\r
-270    Luxembourg\r
-455    Macao, China\r
-294    Macedonia\r
-502    Malaysia\r
-472    Maldives\r
-278    Malta\r
-340    Martinique\r
-334    Mexico\r
-259    Moldova\r
-212    Monaco\r
-428    Mongolia\r
-220    Montenegro\r
-604    Morocco\r
-204    Netherlands\r
-530    New Zealand\r
-621    Nigeria\r
-242    Norway\r
-422    Oman\r
-410    Pakistan\r
-714    Panama\r
-744    Paraguay\r
-716    Peru\r
-515    Philippines\r
-260    Poland\r
-268    Portugal\r
-427    Qatar\r
-226    Romania\r
-250    Russian Federation\r
-420    Saudi Arabia\r
-220    Serbia\r
-525    Singapore\r
-231    Slovakia\r
-293    Slovenia\r
-655    South Africa\r
-214    Spain\r
-413    Sri Lanka\r
-240    Sweden\r
-228    Switzerland\r
-417    Syria\r
-466    Taiwan\r
-520    Thailand\r
-374    Trinidad and Tobago\r
-286    Turkey\r
-255    Ukraine\r
-234    United Kingdom\r
-748    Uruguay\r
-310    USA\r
-734    Venezuela\r

diff --git a/src/maemo/easysetup/modest-easysetup-wizard-dialog.c b/src/maemo/easysetup/modest-easysetup-wizard-dialog.c
index 12efd24..ef5f7ad 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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