Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-global-settings-dialog.c

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 995606b..59cd35c 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -40,8 +40,6 @@
 #include "modest-platform.h"
 #ifdef MODEST_TOOLKIT_HILDON2
 #include "modest-hildon-includes.h"
-#endif
-#ifndef MODEST_TOOLKIT_GTK
 #include <hildon/hildon-number-editor.h>
 #endif
 /* include other impl specific header files */
@@ -200,24 +198,34 @@ _modest_global_settings_dialog_get_update_interval (void)
 {
        GSList *list = NULL;
 
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_5_MIN, 
-                                _("mcen_va_options_updateinterval_5min"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_5_MIN,
+                                _("mcen_va_options_updateinterval_5min"),
+                                &list);
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_10_MIN,
+                                _("mcen_va_options_updateinterval_10min"),
+                                &list);
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_15_MIN,
+                                _("mcen_va_options_updateinterval_15min"),
                                 &list);
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_10_MIN, 
-                                _("mcen_va_options_updateinterval_10min"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_30_MIN,
+                                _("mcen_va_options_updateinterval_30min"),
                                 &list);
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_15_MIN, 
-                                _("mcen_va_options_updateinterval_15min"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_1_HOUR,
+                                _("mcen_va_options_updateinterval_1h"),
                                 &list);
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_30_MIN, 
-                                _("mcen_va_options_updateinterval_30min"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_2_HOUR,
+                                _("mcen_va_options_updateinterval_2h"),
                                 &list);
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_1_HOUR, 
-                                _("mcen_va_options_updateinterval_1h"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_4_HOUR,
+                                _("mcen_va_options_updateinterval_4h"),
                                 &list);
-       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_2_HOUR, 
-                                _("mcen_va_options_updateinterval_2h"), 
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_8_HOUR,
+                                _("mcen_va_options_updateinterval_8h"),
                                 &list);
+       add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_24_HOUR,
+                                _("mcen_va_options_updateinterval_24h"),
+                                &list);
+
 
        return (ModestPairList *) g_slist_reverse (list);
 }
@@ -247,13 +255,12 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
        gint *id;
 
        /* Get values from UI */
-       state->notifications = modest_togglable_get_active (HILDON_CHECK_BUTTON (priv->notifications));
-       state->add_to_contacts = modest_togglabale_get_active (HILDON_CHECK_BUTTON (priv->add_to_contacts));
+       state->notifications = modest_togglable_get_active (priv->notifications);
+       state->add_to_contacts = modest_togglable_get_active (priv->add_to_contacts);
        state->auto_update = modest_togglable_get_active (priv->auto_update);
        id = modest_selector_get_active_id (priv->connect_via);
        state->default_account = modest_selector_get_active_id (priv->default_account_selector);
        state->connect_via = *id;
-       state->size_limit = modest_number_entry_get_value (priv->size_limit);
 
        id = modest_selector_get_active_id (priv->update_interval);
        state->update_interval = *id;
@@ -287,8 +294,6 @@ modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog
        RETURN_FALSE_ON_ERROR(error);
        modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, current_state.update_interval, NULL);
        RETURN_FALSE_ON_ERROR(error);
-       modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, current_state.size_limit, NULL);
-       RETURN_FALSE_ON_ERROR(error);
        modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, current_state.play_sound, NULL);
        RETURN_FALSE_ON_ERROR(error);
        modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, current_state.prefer_formatted_text, NULL);
@@ -354,7 +359,6 @@ settings_changed (ModestGlobalSettingsState initial_state,
            initial_state.add_to_contacts != current_state.add_to_contacts ||
            initial_state.connect_via != current_state.connect_via ||
            initial_state.update_interval != current_state.update_interval ||
-           initial_state.size_limit != current_state.size_limit ||
            initial_state.play_sound != current_state.play_sound ||
            initial_state.prefer_formatted_text != current_state.prefer_formatted_text ||
            (current_state.default_account &&