* src/maemo/modest-msg-edit-window.c:

[modest] / src / maemo / modest-account-settings-dialog.h

diff --git a/src/maemo/modest-account-settings-dialog.h b/src/maemo/modest-account-settings-dialog.h
index 9eee50b..01e7d62 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.h
+++ b/src/maemo/modest-account-settings-dialog.h
@@ -8,7 +8,7 @@
 
 #include <gtk/gtkdialog.h> 
 #include "modest-account-mgr.h"
-#include <hildon-widgets/hildon-caption.h>
+#include "modest-hildon-includes.h"
 
 G_BEGIN_DECLS
 
@@ -41,21 +41,32 @@ typedef struct {
         * and to create new accounts: */
        ModestAccountMgr *account_manager;
        
+       gboolean modified;
+       gchar * account_name; /* This may not change. It is not user visible. */
+       ModestTransportStoreProtocol incoming_protocol; /* This may not change. */
+       ModestTransportStoreProtocol outgoing_protocol; /* This may not change. */
+       gchar * original_account_title;
+
+       ModestAuthProtocol protocol_authentication_incoming;
+       
        GtkWidget *page_account_details;
-       GtkWidget *combo_account_country;
-       GtkWidget *combo_account_serviceprovider;
        GtkWidget *entry_account_title;
+       GtkWidget *combo_retrieve;
+       GtkWidget *combo_limit_retrieve;
+       GtkWidget *caption_leave_messages;
+       GtkWidget *checkbox_leave_messages;
        
        GtkWidget *page_user_details;
        GtkWidget *entry_user_name;
        GtkWidget *entry_user_username;
        GtkWidget *entry_user_password;
        GtkWidget *entry_user_email;
+       GtkWidget *entry_incoming_port;
+       GtkWidget *button_signature;
        
        GtkWidget *page_complete_easysetup;
        
        GtkWidget *page_incoming;
-       GtkWidget *combo_incoming_servertype;
        GtkWidget *caption_incoming;
        GtkWidget *entry_incomingserver;
        GtkWidget *combo_incoming_security;
@@ -63,11 +74,19 @@ typedef struct {
 
        GtkWidget *page_outgoing;
        GtkWidget *entry_outgoingserver;
+       GtkWidget *caption_outgoing_username;
+       GtkWidget *entry_outgoing_username;
+       GtkWidget *caption_outgoing_password;
+       GtkWidget *entry_outgoing_password;
        GtkWidget *combo_outgoing_security;
        GtkWidget *combo_outgoing_auth;
+       GtkWidget *entry_outgoing_port;
        GtkWidget *checkbox_outgoing_smtp_specific;
        GtkWidget *button_outgoing_smtp_servers;
        
+       GtkWidget *specific_window;
+       GtkWidget *signature_dialog;
+       
 } ModestAccountSettingsDialog;
 
 typedef struct {