From fa7f2e377f7c2a763cd18986b5fce8769c1e54a3 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Tue, 21 Aug 2007 09:06:13 +0000 Subject: [PATCH] * src/widgets/modest-global-settings-dialog-priv.h * src/maemo/modest-maemo-global-settings-dialog.c Removed include_reply variable and checkbox * src/widgets/modest-global-settings-dialog.c (_modest_global_settings_dialog_load_conf): (get_current_settings): (_modest_global_settings_dialog_save_conf): (settings_changed): Removed include_reply from the settings dialog. Fixes NB#66193 pmo-trunk-r3029 --- src/maemo/modest-maemo-global-settings-dialog.c | 9 --------- src/widgets/modest-global-settings-dialog-priv.h | 3 --- src/widgets/modest-global-settings-dialog.c | 22 +--------------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c index 9d0d3f5..f850350 100644 --- a/src/maemo/modest-maemo-global-settings-dialog.c +++ b/src/maemo/modest-maemo-global-settings-dialog.c @@ -401,15 +401,6 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self) HILDON_CAPTION_MANDATORY); gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); - /* Reply */ - ppriv->include_reply = gtk_check_button_new (); - caption = hildon_caption_new (size_group, - _("mcen_va_options_include_original_inreply"), - ppriv->include_reply, - NULL, - HILDON_CAPTION_MANDATORY); - gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); - return vbox; } diff --git a/src/widgets/modest-global-settings-dialog-priv.h b/src/widgets/modest-global-settings-dialog-priv.h index 9deadcb..7a885c6 100644 --- a/src/widgets/modest-global-settings-dialog-priv.h +++ b/src/widgets/modest-global-settings-dialog-priv.h @@ -42,7 +42,6 @@ typedef struct _ModestGlobalSettingsState { gint size_limit; gboolean play_sound; gboolean prefer_formatted_text; - gboolean include_reply; } ModestGlobalSettingsState; typedef struct _ModestGlobalSettingsDialogPrivate ModestGlobalSettingsDialogPrivate; @@ -64,8 +63,6 @@ struct _ModestGlobalSettingsDialogPrivate { ModestPairList *msg_format_list; GtkWidget *msg_format; - - GtkWidget *include_reply; gboolean changed; ModestGlobalSettingsState initial_state; diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c index d534a5a..e9dc3d1 100644 --- a/src/widgets/modest-global-settings-dialog.c +++ b/src/widgets/modest-global-settings-dialog.c @@ -316,20 +316,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 +338,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 +367,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 +422,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; -- 1.7.9.5