Use the proper translation for fetching country names and improve mcc detection.

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 686ab37..18db4b3 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -134,9 +134,16 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
        if (!mcc_file) {
-               g_printerr ("modest: check for mcc file failed\n");
+               g_printerr ("modest: check for mcc file (for LANG) failed\n");
+               return FALSE;
+       } else 
+               fclose (mcc_file);
+       
+       mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
+       if (!mcc_file) {
+               g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
                return FALSE;
        } else 
                fclose (mcc_file);
@@ -645,7 +652,8 @@ on_response (GtkDialog *dialog,
                parent = g_object_get_data (G_OBJECT (picker), FOLDER_PICKER_CURRENT_FOLDER);
 
        /* Look for another folder with the same name */
-       if (modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE))
+       if (!TNY_IS_MERGE_FOLDER (parent) &&
+           modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE))
                exists = TRUE;
 
        if (!exists) {
@@ -893,15 +901,17 @@ folder_picker_clicked (GtkButton *button,
        store = folder_chooser_dialog_run (helper->folder_view);
        if (store) {
                const gchar *current_name;
-               gboolean exists;
+               gboolean exists = FALSE;
 
                folder_picker_set_store (GTK_BUTTON (button), store);
 
                /* Update the name of the folder */
                current_name = gtk_entry_get_text (helper->entry);
-               exists = modest_tny_folder_has_subfolder_with_name (store,
-                                                                   current_name,
-                                                                   TRUE);
+
+               if (TNY_IS_FOLDER_STORE (store))
+                       exists = modest_tny_folder_has_subfolder_with_name (store,
+                                                                           current_name,
+                                                                           TRUE);
                if (exists) {
                        gchar *new_name = get_next_folder_name (NULL, store);
                        gtk_entry_set_text (helper->entry, new_name);
@@ -1739,10 +1749,10 @@ modest_platform_show_addressbook (GtkWindow *parent_window)
        }
 }
 
-GtkWidget *
-modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+static GtkWidget *
+modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do_refresh)
 {
-       GtkWidget *widget = modest_folder_view_new (query);
+       GtkWidget *widget = modest_folder_view_new_full (query, do_refresh);
 
        /* Show one account by default */
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
@@ -1756,6 +1766,12 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        return widget;
 }
 
+GtkWidget *
+modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+{
+       return modest_platform_create_folder_view_full (query, TRUE);
+}
+
 void
 banner_finish (gpointer data, GObject *object)
 {
@@ -2836,22 +2852,31 @@ static void
 on_move_to_dialog_action_clicked (GtkButton *selection,
                                  gpointer   user_data)
 {
-       TnyFolderStore *selected;
        GtkWidget *dialog;
-       GtkWidget *folder_view;
        gboolean showing_folders;
 
        dialog = (GtkWidget *) user_data;
        showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
        if (showing_folders) {
+               TnyFolderStore *selected;
+               GtkWidget *folder_view;
+
                folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
                selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
-               if (selected)
+               if (selected) {
                        gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+                       g_object_unref (selected);
+               }
        }
 }
 
+static void
+move_to_dialog_activity_changed (ModestFolderView *folder_view, gboolean activity, GtkDialog *dialog)
+{
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (dialog), activity?1:0);
+}
+
 GtkWidget *
 modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                       GtkWidget **folder_view)
@@ -2879,7 +2904,9 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        top_vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
 
        /* Create folder view */
-       *folder_view = modest_platform_create_folder_view (NULL);
+       *folder_view = modest_platform_create_folder_view_full (NULL, FALSE);
+       g_signal_connect (G_OBJECT (*folder_view), "activity-changed", G_CALLBACK (move_to_dialog_activity_changed),
+                         dialog);
 
        modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view),
                                           MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);