X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.c;h=8f0456b979b2f784166ba82241ce4dd6c5ce3db2;hp=18ffb9a406d24bc057eb21701e25785762fb60d6;hb=f9b14fc42615fb5f60d9236890cfc913515935d8;hpb=02f0668bb12c4fccb22f0fef53548b8e0f39698f

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 18ffb9a..8f0456b 100644
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -48,11 +48,7 @@
 #include "widgets/modest-combo-box.h"
 #endif
 #ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-number-editor.h>
-#else
 #include <hildon/hildon-number-editor.h>
-#endif /*MODEST_HILDON_API = 0*/
 #endif
 /* include other impl specific header files */
 
@@ -210,24 +206,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);
 }
@@ -256,13 +262,16 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
 {
 	gint *id;
 
-	/* Get values from UI */
 #ifdef MODEST_TOOLKIT_HILDON2
 	id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->connect_via));
 	state->auto_update = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auto_update));
+	state->notifications = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->notifications));
+	state->add_to_contacts = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->add_to_contacts));
 	state->default_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->default_account_selector));
 #else
 	id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->connect_via));
+	state->notifications = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->notifications));
+	state->add_to_contacts = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->add_to_contacts));
 	state->auto_update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auto_update));
 	state->default_account = NULL;
 #endif
@@ -312,6 +321,10 @@ modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog
 	get_current_settings (priv, &current_state);
 
 	/* Save configuration */
+	modest_conf_set_bool (conf, MODEST_CONF_NOTIFICATIONS, current_state.notifications, &error);
+	RETURN_FALSE_ON_ERROR(error);
+	modest_conf_set_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, current_state.add_to_contacts, &error);
+	RETURN_FALSE_ON_ERROR(error);
 	modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, current_state.auto_update, &error);
 	RETURN_FALSE_ON_ERROR(error);
 	modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, current_state.connect_via, NULL);
@@ -335,7 +348,7 @@ modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog
 	if (priv->initial_state.auto_update != current_state.auto_update ||
 	    priv->initial_state.connect_via != current_state.connect_via ||
 	    priv->initial_state.update_interval != current_state.update_interval) {
-		
+
 		TnyAccountStore *account_store;
 		TnyDevice *device;
 		
@@ -381,6 +394,8 @@ settings_changed (ModestGlobalSettingsState initial_state,
 		  ModestGlobalSettingsState current_state)
 {
 	if (initial_state.auto_update != current_state.auto_update ||
+	    initial_state.notifications != current_state.notifications ||
+	    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 ||