Remove HildonDialog deprecated symbol

[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 77892e7..18ffb9a 100644 (file)
--- 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
@@ -294,16 +286,22 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
        state->play_sound = priv->initial_state.play_sound;
 #else
        state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound));
+#ifndef MODEST_TOOLKIT_GTK
        id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format));
 #endif
+#endif
+#ifdef MODEST_TOOLKIT_GTK
+       state->prefer_formatted_text = FALSE;
+#else
        state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE;
+#endif
 }
 
 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;
 
@@ -419,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);