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

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 60a6787..18ffb9a 100644
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -107,15 +107,9 @@ modest_global_settings_dialog_get_type (void)
 			(GInstanceInitFunc) modest_global_settings_dialog_init,
 			NULL
 		};
-#ifdef MODEST_TOOLKIT_HILDON2
-		my_type = g_type_register_static (HILDON_TYPE_DIALOG,
-		                                  "ModestGlobalSettingsDialog",
-		                                  &my_info, 0);
-#else
 		my_type = g_type_register_static (GTK_TYPE_DIALOG,
 		                                  "ModestGlobalSettingsDialog",
 		                                  &my_info, 0);
-#endif
 	}
 	return my_type;
 }
@@ -274,9 +268,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 +301,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 +417,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);