2007-04-20 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / easysetup / modest-easysetup-secureauth-combo-box.c

diff --git a/src/maemo/easysetup/modest-easysetup-secureauth-combo-box.c b/src/maemo/easysetup/modest-easysetup-secureauth-combo-box.c
index 01c8453..c900094 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-secureauth-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-secureauth-combo-box.c
@@ -3,9 +3,6 @@
  *
  */
 
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
 #include "modest-easysetup-secureauth-combo-box.h"
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcelllayout.h>
@@ -15,6 +12,11 @@
 #include <stdlib.h>
 #include <string.h> /* For memcpy() */
 
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 G_DEFINE_TYPE (EasysetupSecureauthComboBox, easysetup_secureauth_combo_box, GTK_TYPE_COMBO_BOX);
 
 #define SECUREAUTH_COMBO_BOX_GET_PRIVATE(o) \
@@ -137,9 +139,8 @@ void easysetup_secureauth_combo_box_fill (EasysetupSecureauthComboBox *combobox)
        gtk_list_store_append (liststore, &iter);
        gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_PASSWORD, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_login"), -1);
        
-       /* TODO: I can't find a ModestProtocol enum flag for this: */
        gtk_list_store_append (liststore, &iter);
-       gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)0, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_cram_md5"), -1);
+       gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_AUTH_CRAMMD5, MODEL_COL_NAME, _("mcen_fi_advsetup_smtp_cram_md5"), -1);
 }
 
 /**