bf

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

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 4e18836..6ded19b 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -41,7 +41,6 @@
 #include <modest-maemo-utils.h>
 #include <modest-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
-#include <modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <tny-maemo-conic-device.h>
 #include <tny-camel-folder.h>
@@ -139,26 +138,21 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file ();
+
        if (!mcc_file) {
                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 
+       } else {
                fclose (mcc_file);
-       
+       }
+
        if (access(MODEST_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;
        }
-       
+
        return TRUE;
 }
 
@@ -213,15 +207,6 @@ modest_platform_init (int argc, char *argv[])
        hw_state.shutdown_ind = TRUE;
        osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
 
-       /* Register osso auto-save callbacks: */
-       result = osso_application_set_autosave_cb (osso_context, 
-               modest_on_osso_application_autosave, NULL /* user_data */);
-       if (result != OSSO_OK) {
-               g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
-               return FALSE;
-       }
-       
-
        /* Make sure that the update interval is changed whenever its gconf key 
         * is changed */
        /* CAUTION: we're not using here the
@@ -1609,6 +1594,10 @@ void
 modest_platform_on_new_headers_received (GList *URI_list,
                                         gboolean show_visual)
 {
+       /* Check if the user wants to show notifications or not */
+       if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATIONS, NULL))
+               return;
+
        if (g_list_length (URI_list) == 0)
                return;
 
@@ -3040,7 +3029,8 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                              GTK_WINDOW (parent_window),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
                                              GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             _FM ("ckdg_bd_change_folder_new_folder"),
+                                             MODEST_GTK_RESPONSE_NEW_FOLDER,
                                              NULL);
 
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);