Refactor mcc parsing code

[modest] / src / hildon2 / modest-maemo-utils.c

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index a0bad06..e703c7d 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -156,42 +156,6 @@ modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win,
 #endif /* MODEST_HAVE_HILDON1_WIDGETS */
 }
 
-FILE*
-modest_maemo_open_mcc_mapping_file (gboolean *translated)
-{
-       FILE* result = NULL;
-       const gchar* path;
-       gchar *path1 = g_strdup_printf ("%s.%s", MODEST_OPERATOR_WIZARD_MCC_MAPPING, getenv("LANG"));
-       const gchar* path2 = MODEST_MCC_MAPPING;
-
-       if (translated)
-               *translated = TRUE;
-
-       if (access (path1, R_OK) == 0) {
-               path = path1;
-       } else if (access (MODEST_OPERATOR_WIZARD_MCC_MAPPING, R_OK) == 0) {
-               path = MODEST_OPERATOR_WIZARD_MCC_MAPPING;
-               if (translated)
-                       *translated = FALSE;
-       } else if (access (path2, R_OK) == 0) {
-               path = path2;
-       } else {
-               g_warning ("%s: neither '%s' nor '%s' is a readable mapping file",
-                          __FUNCTION__, path1, path2);
-               goto end;
-       }
-
-       result = fopen (path, "r");
-       if (!result) {
-               g_warning ("%s: error opening mapping file '%s': %s",
-                          __FUNCTION__, path, strerror(errno));
-               goto end;
-       }
- end:
-       g_free (path1);
-       return result;
-}
-
 GtkWidget *
 modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager,
                                                const gchar *item_name)