* src/maemo/modest-retrieve-combo-box.c:

	* Finally disabled "messages" retrieval options. Now we only
	  support "headers only" and "messages with attachments"
	  options (fixes NB#58475).

pmo-trunk-r3206

diff --git a/src/widgets/modest-retrieve-combo-box.c b/src/widgets/modest-retrieve-combo-box.c
index f7f034c..c23d8fb 100644 (file)
--- a/src/widgets/modest-retrieve-combo-box.c
+++ b/src/widgets/modest-retrieve-combo-box.c
@@ -137,14 +137,15 @@ void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTra
        gtk_list_store_set (liststore, &iter, 
                MODEL_COL_CONF_NAME, MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY, 
                MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_headers"), -1);
-       
-       /* Only IMAP should have this option, according to the UI spec: */
-       if (protocol == MODEST_PROTOCOL_STORE_IMAP) {
-               gtk_list_store_append (liststore, &iter);
-               gtk_list_store_set (liststore, &iter, 
-                       MODEL_COL_CONF_NAME, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES, 
-                       MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_messages"), -1);
-       }
+
+       /* We disable messages retrieval finally */
+/*     /\* Only IMAP should have this option, according to the UI spec: *\/ */
+/*     if (protocol == MODEST_PROTOCOL_STORE_IMAP) { */
+/*             gtk_list_store_append (liststore, &iter); */
+/*             gtk_list_store_set (liststore, &iter,  */
+/*                     MODEL_COL_CONF_NAME, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES,  */
+/*                     MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_messages"), -1); */
+/*     } */
        
        
        gtk_list_store_append (liststore, &iter);