Refactor part of ModestWindow and ModestHildon2Window
[modest] / src / hildon2 / modest-platform.c
index 786578a..29e96b5 100644 (file)
@@ -32,6 +32,7 @@
 
 #include <modest-platform.h>
 #include <modest-defs.h>
+#include <modest-scrollable.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
 #include <modest-header-view.h>
@@ -41,7 +42,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>
@@ -66,8 +66,8 @@
 #include "hildon2/modest-hildon2-details-dialog.h"
 #include "hildon2/modest-hildon2-window-mgr.h"
 #ifdef MODEST_USE_PROFILE
-#include <keys_nokia.h>
-#include <libprofile.h>
+#include <profiled/keys_nokia.h>
+#include <profiled/libprofile.h>
 #endif
 #include <canberra.h>
 #include <modest-datetime-formatter.h>
@@ -79,6 +79,7 @@
 #include <modest-selector-picker.h>
 #include <modest-icon-names.h>
 #include <modest-count-stream.h>
+#include <math.h>
 
 #ifdef MODEST_HAVE_MCE
 #include <mce/dbus-names.h>
@@ -96,7 +97,7 @@
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
 #define MODEST_NOTIFICATION_CATEGORY "email-message"
-#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail"
+#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternChatAndEmail"
 #ifdef MODEST_USE_PROFILE
 #define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE
 #define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME
 #define COMMON_FOLDER_DIALOG_ENTRY "entry"
 #define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker"
 #define FOLDER_PICKER_CURRENT_FOLDER "current-folder"
+#define FOLDER_PICKER_ORIGINAL_ACCOUNT "original-account"
 #define MODEST_ALARMD_APPID PACKAGE_NAME
 
+static ca_context *ca_con = NULL;
+static gboolean ca_con_opened = FALSE;
+
 
 static void modest_platform_play_email_tone (void);
 
@@ -134,26 +139,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;
 }
 
@@ -163,23 +163,16 @@ gboolean
 modest_platform_init (int argc, char *argv[])
 {
        osso_context_t *osso_context;
-       
        osso_hw_state_t hw_state = { 0 };
-       DBusConnection *con;    
+       DBusConnection *con;
        GSList *acc_names;
-       
+
        if (!check_required_files ()) {
                g_printerr ("modest: missing required files\n");
                return FALSE;
        }
-       
-       osso_context =  osso_initialize(PACKAGE,PACKAGE_VERSION,
-                                       FALSE, NULL);   
-       if (!osso_context) {
-               g_printerr ("modest: failed to acquire osso context\n");
-               return FALSE;
-       }
-       modest_maemo_utils_set_osso_context (osso_context);
+
+       osso_context = modest_maemo_utils_get_osso_context();
 
        if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
                g_printerr ("modest: could not get dbus connection\n");
@@ -215,15 +208,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
@@ -344,7 +328,7 @@ modest_platform_activate_uri (const gchar *uri)
        HildonURIAction *action;
        gboolean result = FALSE;
        GSList *actions, *iter = NULL;
-       
+
        g_return_val_if_fail (uri, FALSE);
        if (!uri)
                return FALSE;
@@ -352,9 +336,9 @@ modest_platform_activate_uri (const gchar *uri)
        /* don't try to activate file: uri's -- they might confuse the user,
         * and/or might have security implications */
        if (!g_str_has_prefix (uri, "file:")) {
-               
+
                actions = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-               
+
                for (iter = actions; iter; iter = g_slist_next (iter)) {
                        action = (HildonURIAction*) iter->data;
                        if (action && strcmp (hildon_uri_action_get_service (action),
@@ -363,20 +347,20 @@ modest_platform_activate_uri (const gchar *uri)
                                break;
                        }
                }
-               
+
                /* if we could not open it with email, try something else */
                if (!result)
-                       result = checked_hildon_uri_open (uri, NULL);   
-       } 
-       
+                       result = checked_hildon_uri_open (uri, NULL);
+       }
+
        if (!result) {
                ModestWindow *parent =
-                       modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+                       modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
                hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
                                                _("mcen_ib_unsupported_link"));
                g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri);
-       } 
-       
+       }
+
        return result;
 }
 
@@ -436,23 +420,24 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        /* if it's a copy thingy, the uri will look like 'copy:http://slashdot.org' */
        if (g_str_has_prefix (action_name, URI_ACTION_COPY)) {
                GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
-               action_name += strlen(URI_ACTION_COPY); /* jump past the prefix */
+               const gchar *uri = (const gchar *) popup_info->uri;
 
-               if (g_str_has_prefix (action_name, "mailto:")) /* ignore mailto: prefixes */
-                       action_name += strlen ("mailto:");
-               
-               gtk_clipboard_set_text (clipboard, action_name, strlen (action_name));
+               /* Special case: ignore "mailto:" prefixes */
+               if (g_str_has_prefix (uri, "mailto:"))
+                       uri = popup_info->uri + strlen ("mailto:");
+
+               gtk_clipboard_set_text (clipboard, uri, strlen (uri));
                modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
                return; /* we're done */
        }
-       
+
        /* now, the real uri-actions... */
        for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
                HildonURIAction *action = (HildonURIAction *) node->data;
                if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
                        if (!checked_hildon_uri_open (popup_info->uri, action)) {
                                ModestWindow *parent =
-                                       modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+                                       modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
                                hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
                                                                _("mcen_ib_unsupported_link"));
                        }
@@ -461,60 +446,67 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        }
 }
 
-gboolean 
+gboolean
 modest_platform_show_uri_popup (const gchar *uri)
 {
-       GSList *actions_list;
+       GSList *actions_list, *node;
+       GtkWidget *menu;
+       ModestPlatformPopupInfo *popup_info;
+       GtkWidget *menu_item;
 
        if (uri == NULL)
                return FALSE;
-       
-       actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-       if (actions_list) {
-
-               GtkWidget *menu = gtk_menu_new ();
-               ModestPlatformPopupInfo *popup_info = g_new0 (ModestPlatformPopupInfo, 1);
 
-               /* don't add actions for file: uri's -- they might confuse the user,
-                * and/or might have security implications
-                * we still allow to copy the url though
-                */
-               if (!g_str_has_prefix (uri, "file:")) {                 
-               
-                       GSList *node;                   
-                       popup_info->actions = actions_list;
-                       popup_info->uri = g_strdup (uri);
-
-                       for (node = actions_list; node != NULL; node = g_slist_next (node)) {
-                               GtkWidget *menu_item;
-                               const gchar *action_name;
-                               const gchar *translation_domain;
-                               HildonURIAction *action = (HildonURIAction *) node->data;
-                               action_name = hildon_uri_action_get_name (action);
-                               translation_domain = hildon_uri_action_get_translation_domain (action);
-                               menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
-                               g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
-                               g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
-                                                 popup_info);
-
-                               if (hildon_uri_is_default_action (action, NULL)) {
-                                       gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
-                               } else {
-                                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-                               }
-                               gtk_widget_show (menu_item);
-                       }
-               }
+       /* Create menu */
+       menu = gtk_menu_new ();
+       popup_info = g_new0 (ModestPlatformPopupInfo, 1);
+       popup_info->uri = g_strdup (uri);
 
+       /* don't add actions for file: uri's -- they might confuse the user,
+        * and/or might have security implications
+        * we still allow to copy the url though
+        */
+       if (g_str_has_prefix (uri, "file:"))
+               goto add_copy_link;
 
-               /* and what to do when the link is deleted */
-               g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
-               gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+       actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
+       if (!actions_list)
+               goto add_copy_link;
 
-       } else {
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+       popup_info->actions = actions_list;
+       for (node = actions_list; node != NULL; node = g_slist_next (node)) {
+               const gchar *action_name;
+               const gchar *translation_domain;
+               HildonURIAction *action = (HildonURIAction *) node->data;
+               action_name = hildon_uri_action_get_name (action);
+               translation_domain = hildon_uri_action_get_translation_domain (action);
+               menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
+               hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
+               g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
+               g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
+                                 popup_info);
+
+               if (hildon_uri_is_default_action (action, NULL)) {
+                       gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
+               } else {
+                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+               }
+               gtk_widget_show (menu_item);
        }
 
+ add_copy_link:
+       /* Add the "Copy link" menu option */
+       menu_item = gtk_menu_item_new_with_label (_UR("uri_link_copy_link_location"));
+       hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
+       g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer) URI_ACTION_COPY);
+       g_signal_connect (G_OBJECT (menu_item), "activate", (GCallback) activate_uri_popup_item, popup_info);
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+       gtk_widget_show (menu_item);
+
+       /* and what to do when the link is deleted */
+       g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
+       gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+
        return TRUE;
 }
 
@@ -692,50 +684,58 @@ folder_chooser_activated (ModestFolderView *folder_view,
 }
 
 static TnyFolderStore *
-folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current)
+folder_chooser_dialog_run (ModestFolderView *original,
+                          TnyFolderStore *current,
+                          GtkButton *picker)
 {
        GtkWidget *folder_view;
        FolderChooserData userdata = {NULL, NULL};
-       GtkWidget *pannable;
-       gchar *visible_id = NULL;
+       GtkWidget *scrollable;
+       const gchar *visible_id = NULL;
 
-       userdata.dialog = hildon_dialog_new ();
-       pannable = hildon_pannable_area_new ();
+       userdata.dialog = gtk_dialog_new ();
+       scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
        folder_view = modest_platform_create_folder_view (NULL);
 
        gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder"));
 
-       modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), 
+       modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original),
                                       MODEST_FOLDER_VIEW (folder_view));
 
-       if (TNY_IS_FOLDER_STORE (current)) {
-               if (TNY_IS_ACCOUNT (current)) {
-                       visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current)));
-               } else if (TNY_IS_FOLDER (current)) {
-                       TnyAccount *account;
-
-                       account = tny_folder_get_account (TNY_FOLDER (current));
-                       if (account) {
-                               visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current)));
+       if (TNY_IS_ACCOUNT (current)) {
+               /* Local folders and MMC account are always shown
+                  along with the currently visible server account */
+               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (current)) ||
+                   modest_tny_account_is_memory_card_account (TNY_ACCOUNT (current)))
+                       visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT);
+               else
+                       visible_id = tny_account_get_id (TNY_ACCOUNT (current));
+       } else if (TNY_IS_FOLDER (current)) {
+               TnyAccount *account;
+               account = modest_tny_folder_get_account ((TnyFolder *) current);
+               if (account) {
+                       if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) ||
+                           modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) {
+                               visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT);
+                       } else {
+                               visible_id = tny_account_get_id (account);
                        }
+                       g_object_unref (account);
                }
-       }
-
-       if (visible_id == NULL) {
-               visible_id = g_strdup (
-                       modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)));
+       } else {
+               visible_id =
+                       modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original));
        }
 
        modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view),
                                                                     visible_id);
-       g_free (visible_id);
 
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
-       gtk_container_add (GTK_CONTAINER (pannable), folder_view);
-       gtk_widget_set_size_request (pannable, -1, 320);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), scrollable);
+       gtk_container_add (GTK_CONTAINER (scrollable), folder_view);
+       gtk_widget_set_size_request (scrollable, -1, 320);
 
        gtk_widget_show (folder_view);
-       gtk_widget_show (pannable);
+       gtk_widget_show (scrollable);
        gtk_widget_show (userdata.dialog);
        g_signal_connect (G_OBJECT (folder_view), "folder-activated", 
                          G_CALLBACK (folder_chooser_activated), 
@@ -917,7 +917,7 @@ folder_picker_clicked (GtkButton *button,
 
        current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER);
 
-       store = folder_chooser_dialog_run (helper->folder_view, current);
+       store = folder_chooser_dialog_run (helper->folder_view, current, button);
        if (store) {
                const gchar *current_name;
                gboolean exists = FALSE;
@@ -943,15 +943,37 @@ static GtkWidget *
 folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 {
        GtkWidget *button;
+       const gchar *acc_id = NULL;
 
        button = hildon_button_new (MODEST_EDITABLE_SIZE,
                                    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
 
        hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
 
-       if (suggested)
+       if (suggested) {
+
                folder_picker_set_store (GTK_BUTTON (button), suggested);
 
+               if (TNY_IS_ACCOUNT (suggested)) {
+                       if (!modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (suggested)) &&
+                           !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (suggested)))
+                               acc_id = tny_account_get_id ((TnyAccount *) suggested);
+               } else {
+                       TnyAccount *account = modest_tny_folder_get_account ((TnyFolder *) suggested);
+                       if (account) {
+                               acc_id = tny_account_get_id ((TnyAccount *) account);
+                               g_object_unref (account);
+                       }
+               }
+       }
+
+       if (!acc_id)
+               acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+
+       g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
+                               g_strdup (acc_id), (GDestroyNotify) g_free);
+
+
        g_signal_connect (G_OBJECT (button), "clicked",
                          G_CALLBACK (folder_picker_clicked),
                          helper);
@@ -971,7 +993,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
                                          gchar **folder_name,
                                          TnyFolderStore **parent)
 {
-       GtkWidget *accept_btn = NULL; 
+       GtkWidget *accept_btn = NULL;
        GtkWidget *dialog, *entry = NULL, *label_entry = NULL,  *label_location = NULL, *hbox;
        GtkWidget *account_picker = NULL;
        GList *buttons = NULL;
@@ -979,12 +1001,12 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
        GtkSizeGroup *sizegroup;
        ModestFolderView *folder_view;
        ModestWindow *folder_window;
-       ModestHildon2WindowMgr *window_mgr;
+       ModestWindowMgr *window_mgr;
        FolderPickerHelper *helper = NULL;
        GtkWidget *top_vbox, *top_align;
 
-       window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr ();
-       folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr);
+       window_mgr = modest_runtime_get_window_mgr ();
+       folder_window = modest_window_mgr_get_folder_window (window_mgr);
        g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE);
        
        folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window));
@@ -1009,7 +1031,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
 
        if (show_name) {
                label_entry = gtk_label_new (label_text);
-               entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+               entry = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
                gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
 
                gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5);
@@ -1134,14 +1156,16 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                                                    suggested_folder);
 
        /* In hildon 2.2 we always suggest the archive folder as parent */
-       acc_store = modest_runtime_get_account_store ();
-       account = modest_tny_account_store_get_mmc_folders_account (acc_store);
-       if (account) {
-               suggested_folder = (TnyFolderStore *)
-                       modest_tny_account_get_special_folder (account,
-                                                              TNY_FOLDER_TYPE_ARCHIVE);
-               g_object_unref (account);
-               account = NULL;
+       if (!suggested_folder) {
+               acc_store = modest_runtime_get_account_store ();
+               account = modest_tny_account_store_get_mmc_folders_account (acc_store);
+               if (account) {
+                       suggested_folder = (TnyFolderStore *)
+                               modest_tny_account_get_special_folder (account,
+                                                                      TNY_FOLDER_TYPE_ARCHIVE);
+                       g_object_unref (account);
+                       account = NULL;
+               }
        }
 
        /* If there is not archive folder then fallback to local folders account */
@@ -1455,43 +1479,53 @@ gboolean
 modest_platform_set_update_interval (guint minutes)
 {
 #ifdef MODEST_HAVE_LIBALARM
-       
+
+       cookie_t alarm_cookie, *alarm_cookies;
        ModestConf *conf = modest_runtime_get_conf ();
        if (!conf)
                return FALSE;
-               
-       cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL);
-
-       /* Delete any existing alarm,
-        * because we will replace it: */
-       if (alarm_cookie) {
-               if (alarmd_event_del(alarm_cookie) != 0)
-                       g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
-               alarm_cookie = 0;
+
+       if (minutes > 0) {
+               GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
+               if (!acc_names) {
+                       minutes = 0;
+               } else {
+                       modest_account_mgr_free_account_names (acc_names);
+               }
+       }
+
+       /* cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); */
+
+       /* Delete any existing alarm, because we will replace it: */
+       alarm_cookies = alarmd_event_query (0,0, 0,0, MODEST_ALARMD_APPID);
+       if (alarm_cookies) {
+               /* alarmd_event_query returns a zero terminated array */
+               for (; *alarm_cookies != 0; alarm_cookies++) {
+                       alarmd_event_del (*alarm_cookies);
+               }
                modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
        }
-       
+
        /* 0 means no updates: */
        if (minutes == 0)
                return TRUE;
-       
-     
+
        /* Register alarm: */
-       
+
        /* Set the interval in alarm_event_t structure: */
        alarm_event_t *event = alarm_event_create ();
        alarm_event_add_actions (event, 1);
        alarm_action_t *action = alarm_event_get_action (event, 0);
        alarm_event_set_alarm_appid (event, MODEST_ALARMD_APPID);
        event->alarm_time = minutes * 60; /* seconds */
-       
+
        /* Set recurrence every few minutes: */
        event->recur_secs = minutes*60;
        event->recur_count = -1; /* Means infinite */
 
        /* Specify what should happen when the alarm happens:
         * It should call this D-Bus method: */
-        
+
        action->dbus_path = g_strdup(MODEST_DBUS_OBJECT);
        action->dbus_interface = g_strdup (MODEST_DBUS_IFACE);
        action->dbus_service = g_strdup (MODEST_DBUS_SERVICE);
@@ -1505,24 +1539,24 @@ modest_platform_set_update_interval (guint minutes)
         * (The old maemo email-client did this, though it isn't specified in the UI spec.)
         * ALARM_EVENT_CONNECTED will prevent the alarm from being called in case that the device is offline
          */
-       event->flags = ALARM_EVENT_CONNECTED;
-       
+       event->flags = ALARM_EVENT_CONNECTED | ALARM_EVENT_RUN_DELAYED;
+
        alarm_cookie = alarmd_event_add (event);
 
        /* now, free it */
        alarm_event_delete (event);
-       
+
        /* Store the alarm ID in GConf, so we can remove it later:
         * This is apparently valid between application instances. */
        modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, alarm_cookie, NULL);
-       
+
        if (!alarm_cookie) {
            /* Error */
            g_warning ("Error setting alarm event. \n");
-           
+
            return FALSE;
        }
-#endif /* MODEST_HAVE_LIBALARM */      
+#endif /* MODEST_HAVE_LIBALARM */
        return TRUE;
 }
 
@@ -1564,10 +1598,6 @@ modest_platform_on_new_headers_received (GList *URI_list,
        if (g_list_length (URI_list) == 0)
                return;
 
-       /* If the window is in the foreground don't do anything */
-       if (hildon_program_get_is_topmost (hildon_program_get_instance ()))
-               return;
-
 #ifdef MODEST_HAVE_HILDON_NOTIFY
        /* For any other case issue a notification */
        HildonNotification *notification;
@@ -1604,6 +1634,10 @@ modest_platform_on_new_headers_received (GList *URI_list,
                                            -1);
 
        /* Set the led pattern */
+       if (data->time)
+               notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+                                                   "time", data->time);
+
        notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
                                            "dialog-type", 4);
        notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
@@ -1631,8 +1665,6 @@ modest_platform_on_new_headers_received (GList *URI_list,
                g_object_unref (account);
        }
 
-       /* Play sound */
-       modest_platform_play_email_tone ();
        if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) {
                GSList *notifications_list = NULL;
 
@@ -1767,11 +1799,6 @@ modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
                                      MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
 
-       /* Restore settings */
-       modest_widget_memory_restore (modest_runtime_get_conf(), 
-                                     G_OBJECT (widget),
-                                     MODEST_CONF_FOLDER_VIEW_KEY);
-
        return widget;
 }
 
@@ -1891,17 +1918,14 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data)
 {
        gboolean stop_trying = FALSE;
        g_return_val_if_fail (data && data->account, FALSE);
-       
-       printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__,
-               tny_account_get_connection_status (data->account));     
-       
+
        if (data && data->account && 
                /* We want to wait until TNY_CONNECTION_STATUS_INIT has changed to something else,
                 * after which the account is likely to be usable, or never likely to be usable soon: */
                (tny_account_get_connection_status (data->account) != TNY_CONNECTION_STATUS_INIT) )
        {
                data->is_online = TRUE;
-               
+
                stop_trying = TRUE;
        } else {
                /* Give up if we have tried too many times: */
@@ -1912,15 +1936,15 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data)
                        ++(data->count_tries);
                }
        }
-       
+
        if (stop_trying) {
                /* Allow the function that requested this idle callback to continue: */
                if (data->loop)
                        g_main_loop_quit (data->loop);
-                       
+
                if (data->account)
                        g_object_unref (data->account);
-               
+
                return FALSE; /* Don't call this again. */
        } else {
                return TRUE; /* Call this timeout callback again. */
@@ -2030,14 +2054,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
           example. With GTK_RESPONSE_HELP the view button is aligned
           to the left while the other two to the right */
        note = hildon_note_new_confirmation_add_buttons  (
-               NULL,
+               (GtkWindow *) win,
                question,
                _HL("wdgt_bd_yes"),     GTK_RESPONSE_OK,
                _HL("wdgt_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
                _HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL,
                NULL, NULL);
 
-       g_signal_connect (G_OBJECT(note), "response", 
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                    (GtkWindow *) note, (GtkWindow *) win);
+
+       g_signal_connect (G_OBJECT(note), "response",
                          G_CALLBACK(on_cert_dialog_response),
                          (gpointer) certificate);
 
@@ -2574,14 +2601,27 @@ modest_platform_get_osso_context (void)
        return modest_maemo_utils_get_osso_context ();
 }
 
+static gfloat
+convert_volume_to_db (int linear_volume)
+{
+    gfloat linear_converted = linear_volume / 100.0;
+    gfloat db_vol = 0.0;
+    
+    db_vol = 20 * log10 (linear_converted);
+    if (isinf (db_vol) != 0)
+        return -60.0;
+
+    return db_vol;
+}
+
 static void
 modest_platform_play_email_tone (void)
 {
        gchar *mail_tone;
        gint mail_volume_int;
        int ret;
-       ca_context *ca_con = NULL;
        ca_proplist *pl = NULL;
+       gfloat db_volume;
 
 #ifdef MODEST_USE_PROFILE
        gchar *active_profile;
@@ -2594,7 +2634,7 @@ modest_platform_play_email_tone (void)
        g_free (mail_volume);
        g_free (active_profile);
 #else
-       mail_tone = MAIL_TONE;
+       mail_tone = g_strdup (MAIL_TONE);
        mail_volume_int = 100;
 #endif
 
@@ -2608,26 +2648,37 @@ modest_platform_play_email_tone (void)
 
        if (mail_volume_int > 0) {
 
-               if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) {
-                       g_warning("ca_context_create: %s\n", ca_strerror(ret));
-                       return;
+               if (ca_con == NULL) {
+                       if ((ret = ca_context_create (&ca_con)) != CA_SUCCESS) {
+                               g_warning("ca_context_create: %s\n", ca_strerror(ret));
+                               ca_con = NULL;
+                               return;
+                       }
+                       if ((ret = ca_context_set_driver (ca_con, "gstreamer")) != CA_SUCCESS) {
+                               g_warning ("ca_context_set_driver: %s\n", ca_strerror (ret));
+                               ca_con = NULL;
+                               return;
+                       }
                }
 
-               if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
-                       g_warning("ca_context_open: %s\n", ca_strerror(ret));
-                       ca_context_destroy(ca_con);
-                       return;
+               if (!ca_con_opened) {
+                       if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
+                               g_warning("ca_context_open: %s\n", ca_strerror(ret));
+                               return;
+                       } else {
+                               ca_con_opened = TRUE;
+                       }
                }
 
                ca_proplist_create(&pl);
                ca_proplist_sets(pl, CA_PROP_MEDIA_FILENAME, mail_tone);
-               ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", (gfloat) mail_volume_int);
+               db_volume = convert_volume_to_db (mail_volume_int);
+               ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", db_volume);
 
                ret = ca_context_play_full(ca_con, 0, pl, NULL, NULL);
                g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret));
 
                ca_proplist_destroy(pl);
-               ca_context_destroy(ca_con);
        }
 
        g_free (mail_tone);
@@ -2637,7 +2688,7 @@ modest_platform_play_email_tone (void)
 #define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
 #define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
 #define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
-#define MOVE_TO_DIALOG_PANNABLE "pannable"
+#define MOVE_TO_DIALOG_SCROLLABLE "scrollable"
 #define MOVE_TO_FOLDER_SEPARATOR "/"
 
 static void
@@ -2754,13 +2805,13 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
 {
        GtkWidget *back_button;
        GtkWidget *folder_view;
-       GtkWidget *pannable;
+       GtkWidget *scrollable;
        GtkWidget *action_button;
 
         back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
         action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
         folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
-        pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+        scrollable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
 
        gtk_widget_set_sensitive (back_button, FALSE);
        gtk_widget_set_sensitive (action_button, FALSE);
@@ -2785,7 +2836,7 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
                                         MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
        modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), 
                                       MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
-       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+       modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
 }
 
 static void
@@ -2795,7 +2846,7 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
        GtkWidget *folder_view;
        TnyAccount *account;
        const gchar *account_id;
-       GtkWidget *pannable;
+       GtkWidget *scrollable;
        GtkWidget *action_button;
 
         back_button =
@@ -2804,8 +2855,8 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
                GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
         folder_view =
                GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
-        pannable =
-               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+        scrollable =
+               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
 
        gtk_widget_set_sensitive (back_button, TRUE);
        gtk_widget_set_sensitive (action_button, TRUE);
@@ -2841,7 +2892,7 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
        modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
        modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
-       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+       modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
 }
 
 static void
@@ -2887,13 +2938,14 @@ on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
                        valid  = !modest_protocol_registry_protocol_type_has_tag 
                                (modest_runtime_get_protocol_registry (),
                                 protocol_type,
-                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
                }
                if (valid)
                        move_to_dialog_show_folders (dialog, selected);
        } else {
                move_to_dialog_set_selected_folder_store (dialog, selected);
        }
+       g_object_unref (selected);
 }
 
 static void
@@ -2936,7 +2988,14 @@ on_move_to_dialog_action_clicked (GtkButton *selection,
                selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
                if (selected) {
-                       gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+                       /* It's not possible to select root folders as
+                          targets unless they're the local account or
+                          the memory card account */
+                       if ((TNY_IS_FOLDER (selected) && !TNY_IS_MERGE_FOLDER (selected)) ||
+                           (TNY_IS_ACCOUNT (selected) &&
+                            (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (selected)) ||
+                             modest_tny_account_is_memory_card_account (TNY_ACCOUNT (selected)))))
+                               gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
                        g_object_unref (selected);
                }
        }
@@ -2967,7 +3026,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);
@@ -3004,8 +3064,8 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE);
        gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0);
 
-       /* Create pannable and add it to the dialog */
-       folder_view_container = hildon_pannable_area_new ();
+       /* Create scrollable and add it to the dialog */
+       folder_view_container = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
        gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
        gtk_box_pack_start (GTK_BOX (top_vbox), folder_view_container, TRUE, TRUE, 0);
 
@@ -3027,7 +3087,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
-       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE, folder_view_container);
 
         /* Simulate the behaviour of a HildonPickerDialog by emitting
           a response when a folder is selected */