X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.c;h=2adbe1bc2ee7e0d4a4a448894253ca9517b35af9;hp=60a6787a2d663a2510dc0ac3caad8d5296143756;hb=6183d19c63a5a7ec54f2ec80368cdc973d34602f;hpb=2f39f8b19cfc9d68159a0dd4c813cff348fa57fe

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 60a6787..2adbe1b 100644
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -274,9 +274,7 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
 #endif
 	state->connect_via = *id;
 #ifndef MODEST_TOOLKIT_GTK
-#ifdef MODEST_TOOLKIT_HILDON2
-	state->size_limit = modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->size_limit));
-#else
+#ifndef MODEST_TOOLKIT_HILDON2
 	state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
 #endif
 #else
@@ -309,7 +307,7 @@ static gboolean
 modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog *self)
 {
 	ModestConf *conf;
-	ModestGlobalSettingsState current_state;
+	ModestGlobalSettingsState current_state = {0,};
 	GError *error = NULL;
 	ModestGlobalSettingsDialogPrivate *priv;
 
@@ -425,8 +423,8 @@ on_response (GtkDialog *dialog,
 	     gpointer user_data)
 {
 	ModestGlobalSettingsDialogPrivate *priv;
-	ModestGlobalSettingsState current_state;
-	gboolean changed;
+	ModestGlobalSettingsState current_state = {0,};
+	gboolean changed = FALSE;
 
 	priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);