Change resize-mode of ModestAttachmentsView so all attachments

[modest] / src / widgets / modest-retrieve-combo-box.c

diff --git a/src/widgets/modest-retrieve-combo-box.c b/src/widgets/modest-retrieve-combo-box.c
index e7fde86..c23d8fb 100644 (file)
--- a/src/widgets/modest-retrieve-combo-box.c
+++ b/src/widgets/modest-retrieve-combo-box.c
@@ -85,7 +85,7 @@ enum MODEL_COLS {
        MODEL_COL_CONF_NAME = 1 /* a string */
 };
 
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocol protocol);
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol);
 
 static void
 modest_retrieve_combo_box_init (ModestRetrieveComboBox *self)
@@ -124,7 +124,7 @@ modest_retrieve_combo_box_new (void)
  * #combobox: The combo box.
  * @protocol: IMAP or POP.
  */
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocol protocol)
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol)
 {      
        ModestRetrieveComboBoxPrivate *priv = RETRIEVE_COMBO_BOX_GET_PRIVATE (combobox);
        
@@ -137,19 +137,21 @@ void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestPro
        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);
+
+       /* 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);
        gtk_list_store_set (liststore, &iter, 
-               MODEL_COL_CONF_NAME, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES, 
-               MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_messages"), -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_AND_ATTACHMENTS, 
-                       MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_messages_attachments"), -1);
-       }
+               MODEL_COL_CONF_NAME, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS, 
+               MODEL_COL_NAME, _("mcen_fi_advsetup_retrievetype_messages_attachments"), -1);
 }
 
 /**