* src/widgets/modest-gtkhtml-msg-view.c:

[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 43d01f1..778ccbc 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -42,11 +42,11 @@
 #include "modest-platform.h"
 #include "widgets/modest-combo-box.h"
 #ifdef MODEST_PLATFORM_MAEMO
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
 #include <hildon-widgets/hildon-number-editor.h>
 #else
 #include <hildon/hildon-number-editor.h>
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
 #endif
 /* include other impl specific header files */
 
@@ -124,11 +124,10 @@ modest_global_settings_dialog_init (ModestGlobalSettingsDialog *self)
        priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
 
        priv->notebook = gtk_notebook_new ();
-       priv->changed = FALSE;
 
        /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
     
        /* Connect to the dialog's response signal: */
        g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self);
@@ -316,20 +315,6 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self)
        modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->msg_format), 
                                        (gpointer) &combo_id);
        priv->initial_state.prefer_formatted_text = checked;
-
-       /* Include reply */
-       value = modest_conf_get_int (conf, MODEST_CONF_REPLY_TYPE, &error);
-       if (error) {
-               g_error_free (error);
-               error = NULL;
-               value = MODEST_TNY_MSG_REPLY_TYPE_QUOTE;
-       }
-       if (value == MODEST_TNY_MSG_REPLY_TYPE_QUOTE)
-               checked = TRUE;
-       else
-               checked = FALSE;
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->include_reply), checked);
-       priv->initial_state.include_reply = checked;
 }
 
 static void 
@@ -352,7 +337,6 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
        state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound));
        id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format));
        state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE;
-       state->include_reply = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->include_reply));
 }
 
 gboolean
@@ -382,10 +366,6 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self)
        RETURN_FALSE_ON_ERROR(error);
        modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, current_state.prefer_formatted_text, NULL);
        RETURN_FALSE_ON_ERROR(error);
-       modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE,
-                            (current_state.include_reply) ? MODEST_TNY_MSG_REPLY_TYPE_QUOTE : 
-                            MODEST_TNY_MSG_REPLY_TYPE_CITE, NULL);
-       RETURN_FALSE_ON_ERROR(error);
 
        /* Apply changes */
        if (priv->initial_state.auto_update != current_state.auto_update || 
@@ -441,8 +421,7 @@ settings_changed (ModestGlobalSettingsState initial_state,
            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 ||
-           initial_state.include_reply != current_state.include_reply)
+           initial_state.prefer_formatted_text != current_state.prefer_formatted_text)
                return TRUE;
        else
                return FALSE;
@@ -491,5 +470,5 @@ static ModestConnectedVia
 current_connection_default (void)
 {
        g_warning ("You must implement %s", __FUNCTION__);
-       g_return_val_if_reached (-1);
+       g_return_val_if_reached (MODEST_CONNECTED_VIA_ANY);
 }