* Fixes NB#82696, auto update is working again
[modest] / src / maemo / modest-platform.c
index 8956d24..4324559 100644 (file)
@@ -54,7 +54,7 @@
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <modest-account-settings-dialog.h>
-#include <maemo/easysetup/modest-easysetup-wizard.h>
+#include <easysetup/modest-easysetup-wizard-dialog.h>
 #include <hildon/hildon-sound.h>
 
 #ifdef MODEST_HAVE_MCE
@@ -837,6 +837,9 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
                gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
        else
                gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
+       gtk_entry_set_width_chars (GTK_ENTRY (entry),
+                                  MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
+                                       g_utf8_strlen (_("mcen_ia_default_folder_name"), -1)));
        gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
 
        /* Connect to the response method to avoid closing the dialog
@@ -859,15 +862,19 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
        /* Create the hbox */
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 
        /* Add hbox to dialog */
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
                            hbox, FALSE, FALSE, 0);
-       
+
        gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
        gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-       
+
+       /* Some locales like pt_BR need this to get the full window
+          title shown */
+       gtk_widget_set_size_request (GTK_WIDGET (dialog), 300, -1);
+               
        result = gtk_dialog_run (GTK_DIALOG(dialog));
        if (result == GTK_RESPONSE_ACCEPT)
                *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -886,7 +893,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                                       gchar *suggested_name,
                                       gchar **folder_name)
 {
-       gchar *real_suggested_name = NULL;
+       gchar *real_suggested_name = NULL, *tmp = NULL;
        gint result;
 
        if(suggested_name == NULL)
@@ -922,12 +929,15 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                real_suggested_name = suggested_name;
        }
 
+       tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL);
        result = modest_platform_run_folder_name_dialog (parent_window, 
                                                         parent_folder,
                                                         _("mcen_ti_new_folder"),
-                                                        _("mcen_fi_new_folder_name"),
+                                                        tmp,
                                                         real_suggested_name,
                                                         folder_name);
+       g_free (tmp);
+
        if (suggested_name == NULL)
                g_free(real_suggested_name);
 
@@ -1297,8 +1307,9 @@ modest_platform_set_update_interval (guint minutes)
         * Also use ALARM_EVENT_ACTIVATION so that modest is started (without UI) to get emails 
         * This is why we want to use the Alarm API instead of just g_timeout_add().
         * (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_NO_DIALOG | ALARM_EVENT_ACTIVATION;
+       event->flags = ALARM_EVENT_NO_DIALOG | ALARM_EVENT_ACTIVATION | ALARM_EVENT_CONNECTED;
        
        alarm_cookie = alarm_event_add (event);
 
@@ -1336,53 +1347,73 @@ modest_platform_set_update_interval (guint minutes)
        return TRUE;
 }
 
-void 
-modest_platform_on_new_headers_received (TnyList *header_list,
-                                        gboolean show_visual)
+void
+modest_platform_push_email_notification(void)
 {
        gboolean play_sound;
+       ModestWindow *main_window;
+       gboolean screen_on = TRUE, app_in_foreground;
 
        /* Check whether or not we should play a sound */
        play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
                                           MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
                                           NULL);
 
-       if (!show_visual) {
-               gboolean screen_on, app_in_foreground;
-               ModestWindow *main_window;
-
-               /* Get the screen status */
-               main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       /* Get the screen status */
+       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       if (main_window)
                screen_on = modest_main_window_screen_is_on (MODEST_MAIN_WINDOW (main_window));
 
-               /* Get the window status */
-               app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
+       /* Get the window status */
+       app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
 
-               /* If the screen is on and the app is in the
-                  foreground we don't show anything */
-               if (!(screen_on && app_in_foreground)) {
-                       /* Play a sound */
-                       if (play_sound)
-                               hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
-                       
-                       /* Activate LED. This must be deactivated by
-                          modest_platform_remove_new_mail_notifications */
+       /* If the screen is on and the app is in the
+          foreground we don't show anything */
+       if (!(screen_on && app_in_foreground)) {
+               /* Play a sound */
+               if (play_sound)
+                       hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
+
+               /* Activate LED. This must be deactivated by
+                  modest_platform_remove_new_mail_notifications */
 #ifdef MODEST_HAVE_MCE
-                       osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
-                                            MCE_SERVICE,
-                                            MCE_REQUEST_PATH,
-                                            MCE_REQUEST_IF,
-                                            MCE_ACTIVATE_LED_PATTERN,
-                                            NULL,
-                                            DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
-                                            DBUS_TYPE_INVALID);
+               osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
+                                    MCE_SERVICE,
+                                    MCE_REQUEST_PATH,
+                                    MCE_REQUEST_IF,
+                                    MCE_ACTIVATE_LED_PATTERN,
+                                    NULL,
+                                    DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
+                                    DBUS_TYPE_INVALID);
 #endif
-               }
+       }
+}
+
+void 
+modest_platform_on_new_headers_received (TnyList *header_list,
+                                        gboolean show_visual)
+{
+       g_return_if_fail (TNY_IS_LIST(header_list));
+
+       if (tny_list_get_length(header_list) == 0) {
+               g_warning ("%s: header list is empty", __FUNCTION__);
+               return;
+       }
+       
+       if (!show_visual) {
+                modest_platform_push_email_notification ();
                /* We do a return here to avoid indentation with an else */
                return;
        }
 
 #ifdef MODEST_HAVE_HILDON_NOTIFY
+       gboolean play_sound;
+
+       /* Check whether or not we should play a sound */
+       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
+                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
+                                          NULL);
+
        HildonNotification *notification;
        TnyIterator *iter;
        GSList *notifications_list = NULL;
@@ -1603,7 +1634,6 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
 void
 banner_finish (gpointer data, GObject *object)
 {
-       g_message ("BANNER FINISH");
        ModestWindowMgr *mgr = (ModestWindowMgr *) data;
        modest_window_mgr_unregister_banner (mgr);
        g_object_unref (mgr);
@@ -1767,7 +1797,7 @@ static void
 on_cert_dialog_response (GtkDialog *dialog, gint response_id,  const gchar* cert)
 {
        /* GTK_RESPONSE_HELP means we need to show the certificate */
-       if (response_id == GTK_RESPONSE_HELP) {
+       if (response_id == GTK_RESPONSE_APPLY) {
                GtkWidget *note;
                gchar *msg;
                
@@ -1804,11 +1834,15 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
        gchar *question = g_strdup_printf (_("mcen_nc_unknown_certificate"),
                                           server_name);
        
+       /* We use GTK_RESPONSE_APPLY because we want the button in the
+          middle of OK and CANCEL the same as the browser does for
+          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  (
                GTK_WINDOW(main_win),
                question,
                _("mcen_bd_dialog_ok"),     GTK_RESPONSE_OK,
-               _("mcen_bd_view"),          GTK_RESPONSE_HELP,   /* abusing this... */
+               _("mcen_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
                _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL,
                NULL, NULL);
        
@@ -1967,6 +2001,7 @@ on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, g
        
 void 
 modest_platform_connect_and_perform (GtkWindow *parent_window, 
+                                    gboolean force,
                                     TnyAccount *account, 
                                     ModestConnectedPerformer callback, 
                                     gpointer user_data)
@@ -1975,15 +2010,10 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
        TnyDevice *device;
        TnyConnectionStatus conn_status;
        OnWentOnlineInfo *info;
-       gboolean user_requested;
        
        device = modest_runtime_get_device();
        device_online = tny_device_is_online (device);
 
-       /* Whether the connection is user requested or automatically
-          requested, for example via D-Bus */
-       user_requested = (parent_window) ? TRUE : FALSE;
-
        /* If there is no account check only the device status */
        if (!account) {
                
@@ -2010,7 +2040,7 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
                        info->callback = callback;
                
                        tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
-                                                             user_requested, on_conic_device_went_online, 
+                                                             force, on_conic_device_went_online, 
                                                              info);
  
                        /* We'll cleanup in on_conic_device_went_online */
@@ -2063,7 +2093,7 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
                 * and the account */
                
                tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
-                                                     user_requested, on_conic_device_went_online, 
+                                                     force, on_conic_device_went_online, 
                                                      info);
                
        } else {
@@ -2082,6 +2112,7 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
 
 void
 modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, 
+                                              gboolean force,
                                               TnyFolderStore *folder_store, 
                                               ModestConnectedPerformer callback, 
                                               gpointer user_data)
@@ -2123,11 +2154,49 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
                }
        }
  
-       modest_platform_connect_and_perform (parent_window, account, callback, user_data);
+       modest_platform_connect_and_perform (parent_window, force, account, callback, user_data);
  
        return;
 }
 
+static void
+src_account_connect_performer (gboolean canceled, 
+                              GError *err,
+                              GtkWindow *parent_window, 
+                              TnyAccount *src_account, 
+                              gpointer user_data)
+{
+       DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data;
+
+       if (canceled || err) {
+               /* If there was any error call the user callback */
+               info->callback (canceled, err, parent_window, src_account, info->data);
+       } else {
+               /* Connect the destination account */
+               modest_platform_connect_if_remote_and_perform (parent_window, TRUE, 
+                                                              TNY_FOLDER_STORE (info->dst_account),
+                                                              info->callback, info->data);
+       }
+
+       /* Free the info object */
+       g_object_unref (info->dst_account);
+       g_slice_free (DoubleConnectionInfo, info);
+}
+
+
+void 
+modest_platform_double_connect_and_perform (GtkWindow *parent_window, 
+                                           gboolean force,
+                                           TnyFolderStore *folder_store,
+                                           DoubleConnectionInfo *connect_info)
+{
+       modest_platform_connect_if_remote_and_perform(parent_window, 
+                                                     force,
+                                                     folder_store, 
+                                                     src_account_connect_performer, 
+                                                     connect_info);
+}
+
 GtkWidget *
 modest_platform_get_account_settings_dialog (ModestAccountSettings *settings)
 {
@@ -2144,3 +2213,38 @@ modest_platform_get_account_settings_wizard ()
 
        return GTK_WIDGET (dialog);
 }
+
+ModestConnectedVia
+modest_platform_get_current_connection (void)
+{
+       TnyDevice *device = NULL;
+       ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
+       
+       device = modest_runtime_get_device ();
+
+       if (!tny_device_is_online (device))
+               return MODEST_CONNECTED_VIA_ANY;
+
+#ifdef MODEST_HAVE_CONIC
+       /* Get iap id */
+       const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
+       if (iap_id) {
+               ConIcIap *iap = tny_maemo_conic_device_get_iap (
+                       TNY_MAEMO_CONIC_DEVICE (device), iap_id);
+               const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
+               if (bearer_type) {
+                       if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
+                           !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||
+                           !strcmp (bearer_type, "WIMAX")) {
+                               retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
+                       } else {
+                               retval = MODEST_CONNECTED_VIA_ANY;
+                       }
+               }       
+               g_object_unref (iap);
+       }
+#else
+       retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */  
+#endif /* MODEST_HAVE_CONIC */
+       return retval;
+}