X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=docs%2Freference%2Fmodest-sections.txt;fp=docs%2Freference%2Fmodest-sections.txt;h=cf816e5f48fbf4b0d2ff17617ae09f2774a9f727;hp=859d31793e73ef34792ad6d73014627dcb822702;hb=2ded5c8d7b2fc0b7fad127294e997939fe8d6a8e;hpb=91be12eed247f71f53048b38e3ac323ee9fb81d0

diff --git a/docs/reference/modest-sections.txt b/docs/reference/modest-sections.txt
index 859d317..cf816e5 100644
--- a/docs/reference/modest-sections.txt
+++ b/docs/reference/modest-sections.txt
@@ -1,33 +1,10 @@
 <SECTION>
-<FILE>modest-tny-attachment</FILE>
-<TITLE>ModestTnyAttachment</TITLE>
-ModestTnyAttachment
-modest_tny_attachment_new
-modest_tny_attachment_set_name
-modest_tny_attachment_get_name
-modest_tny_attachment_set_filename
-modest_tny_attachment_get_filename
-modest_tny_attachment_set_mime_type
-modest_tny_attachment_get_mime_type
-modest_tny_attachment_guess_mime_type
-modest_tny_attachment_get_stream
-modest_tny_attachment_free_list
-<SUBSECTION Standard>
-MODEST_TNY_ATTACHMENT
-MODEST_IS_TNY_ATTACHMENT
-MODEST_TYPE_TNY_ATTACHMENT
-modest_tny_attachment_get_type
-MODEST_TNY_ATTACHMENT_CLASS
-MODEST_IS_TNY_ATTACHMENT_CLASS
-MODEST_TNY_ATTACHMENT_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-ui</FILE>
 <TITLE>ModestUI</TITLE>
 ModestUI
 modest_ui_new
 modest_ui_main_window
+modest_ui_edit_window
 <SUBSECTION Standard>
 MODEST_UI
 MODEST_IS_UI
@@ -48,11 +25,11 @@ modest_account_mgr_new
 modest_account_mgr_add_account
 modest_account_mgr_add_server_account
 modest_account_mgr_remove_account
+modest_account_mgr_get_account_data
+modest_account_mgr_free_account_data
 modest_account_mgr_account_names
 modest_account_mgr_search_server_accounts
 modest_account_mgr_account_exists
-modest_account_mgr_get_account_data
-modest_account_mgr_free_account_data
 modest_account_mgr_account_set_enabled
 modest_account_mgr_account_get_enabled
 modest_account_mgr_get_string
@@ -75,39 +52,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-protocol-mgr</FILE>
-<TITLE>ModestProtocolMgr</TITLE>
-ModestProtocolMgr
-MODEST_PROTOCOL_TRANSPORT_SENDMAIL
-MODEST_PROTOCOL_TRANSPORT_SMTP
-MODEST_PROTOCOL_STORE_NONE
-MODEST_PROTOCOL_STORE_POP
-MODEST_PROTOCOL_STORE_IMAP
-MODEST_PROTOCOL_STORE_MAILDIR
-MODEST_PROTOCOL_STORE_MBOX
-MODEST_PROTOCOL_SECURITY_NONE
-MODEST_PROTOCOL_SECURITY_SSL
-MODEST_PROTOCOL_SECURITY_TLS
-MODEST_PROTOCOL_AUTH_NONE
-MODEST_PROTOCOL_AUTH_PASSWORD
-ModestProtocolType
-modest_protocol_mgr_new
-modest_protocol_mgr_get_transport_protocols
-modest_protocol_mgr_get_store_protocols
-modest_protocol_mgr_get_security_protocols
-modest_protocol_mgr_get_auth_protocols
-modest_protocol_mgr_protocol_is_valid
-<SUBSECTION Standard>
-MODEST_PROTOCOL_MGR
-MODEST_IS_PROTOCOL_MGR
-MODEST_TYPE_PROTOCOL_MGR
-modest_protocol_mgr_get_type
-MODEST_PROTOCOL_MGR_CLASS
-MODEST_IS_PROTOCOL_MGR_CLASS
-MODEST_PROTOCOL_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-conf</FILE>
 ModestConfValueType
 ModestConfEvent
@@ -139,13 +83,32 @@ MODEST_CONF_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-formatter</FILE>
+<TITLE>ModestFormatter</TITLE>
+ModestFormatter
+modest_formatter_new
+modest_formatter_cite
+modest_formatter_quote
+modest_formatter_inline
+modest_formatter_attach
+<SUBSECTION Standard>
+MODEST_FORMATTER
+MODEST_IS_FORMATTER
+MODEST_TYPE_FORMATTER
+modest_formatter_get_type
+MODEST_FORMATTER_CLASS
+MODEST_IS_FORMATTER_CLASS
+MODEST_FORMATTER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-tny-platform-factory</FILE>
 <TITLE>ModestTnyPlatformFactory</TITLE>
 ModestTnyPlatformFactory
 modest_tny_platform_factory_get_instance
-modest_tny_platform_factory_get_modest_account_mgr_instance
-modest_tny_platform_factory_get_modest_conf_instance
-modest_tny_platform_factory_get_modest_mail_operation_queue_instance
+modest_tny_platform_factory_get_account_mgr_instance
+modest_tny_platform_factory_get_conf_instance
+modest_tny_platform_factory_get_mail_operation_queue_instance
 <SUBSECTION Standard>
 MODEST_TNY_PLATFORM_FACTORY
 MODEST_IS_TNY_PLATFORM_FACTORY
@@ -176,40 +139,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-formatter</FILE>
-<TITLE>ModestFormatter</TITLE>
-ModestFormatter
-modest_formatter_new
-modest_formatter_cite
-modest_formatter_quote
-modest_formatter_inline
-modest_formatter_attach
-<SUBSECTION Standard>
-MODEST_FORMATTER
-MODEST_IS_FORMATTER
-MODEST_TYPE_FORMATTER
-modest_formatter_get_type
-MODEST_FORMATTER_CLASS
-MODEST_IS_FORMATTER_CLASS
-MODEST_FORMATTER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-stream-gtkhtml</FILE>
-<TITLE>ModestTnyStreamGtkhtml</TITLE>
-ModestTnyStreamGtkhtml
-modest_tny_stream_gtkhtml_new
-<SUBSECTION Standard>
-MODEST_TNY_STREAM_GTKHTML
-MODEST_IS_TNY_STREAM_GTKHTML
-MODEST_TYPE_TNY_STREAM_GTKHTML
-modest_tny_stream_gtkhtml_get_type
-MODEST_TNY_STREAM_GTKHTML_CLASS
-MODEST_IS_TNY_STREAM_GTKHTML_CLASS
-MODEST_TNY_STREAM_GTKHTML_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-mail-operation</FILE>
 ModestMailOperationForwardType
 ModestMailOperationReplyType
@@ -262,8 +191,6 @@ modest_widget_factory_get_status_bar
 modest_widget_factory_get_combo_box
 modest_widget_factory_get_online_toggle
 modest_widget_factory_get_folder_info_label
-modest_widget_factory_get_main_toolbar
-modest_widget_factory_get_edit_toolbar
 <SUBSECTION Standard>
 MODEST_WIDGET_FACTORY
 MODEST_IS_WIDGET_FACTORY
@@ -322,26 +249,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_requires_auth
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -361,36 +268,23 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-modest_main_window_get_widget_factory
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -424,25 +318,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -462,50 +337,22 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -524,6 +371,8 @@ modest_header_view_get_columns
 modest_header_view_set_style
 modest_header_view_get_style
 modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
 <SUBSECTION Standard>
 MODEST_HEADER_VIEW
 MODEST_IS_HEADER_VIEW
@@ -535,19 +384,54 @@ MODEST_HEADER_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-edit-msg-window</FILE>
+<TITLE>ModestEditMsgWindow</TITLE>
+ModestEditMsgWindow
+ModestEditType
+MsgData
+modest_edit_msg_window_new
+modest_edit_msg_window_set_msg
+modest_edit_msg_window_get_msg_data
+modest_edit_msg_window_free_msg_data
 <SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
+MODEST_EDIT_MSG_WINDOW
+MODEST_IS_EDIT_MSG_WINDOW
+MODEST_TYPE_EDIT_MSG_WINDOW
+modest_edit_msg_window_get_type
+MODEST_EDIT_MSG_WINDOW_CLASS
+MODEST_IS_EDIT_MSG_WINDOW_CLASS
+MODEST_EDIT_MSG_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -556,9 +440,7 @@ MODEST_TOOLBAR_GET_CLASS
 ModestFolderView
 modest_folder_view_new
 modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
+modest_folder_view_get_selected
 <SUBSECTION Standard>
 MODEST_FOLDER_VIEW
 MODEST_IS_FOLDER_VIEW
@@ -587,12 +469,27 @@ MODEST_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-msg-view</FILE>
-<TITLE>ModestMsgView</TITLE>
-ModestMsgView
-modest_msg_view_new
-modest_msg_view_set_message
-<SUBSECTION Standard>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-msg-view</FILE>
+<TITLE>ModestMsgView</TITLE>
+ModestMsgView
+modest_msg_view_new
+modest_msg_view_set_message
+<SUBSECTION Standard>
 MODEST_MSG_VIEW
 MODEST_IS_MSG_VIEW
 MODEST_TYPE_MSG_VIEW
@@ -603,19 +500,21 @@ MODEST_MSG_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
+modest_window_get_account_store
+modest_window_get_widget_factory
 <SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -634,6 +533,8 @@ modest_header_view_get_columns
 modest_header_view_set_style
 modest_header_view_get_style
 modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
 <SUBSECTION Standard>
 MODEST_HEADER_VIEW
 MODEST_IS_HEADER_VIEW
@@ -645,19 +546,54 @@ MODEST_HEADER_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-edit-msg-window</FILE>
+<TITLE>ModestEditMsgWindow</TITLE>
+ModestEditMsgWindow
+ModestEditType
+MsgData
+modest_edit_msg_window_new
+modest_edit_msg_window_set_msg
+modest_edit_msg_window_get_msg_data
+modest_edit_msg_window_free_msg_data
 <SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
+MODEST_EDIT_MSG_WINDOW
+MODEST_IS_EDIT_MSG_WINDOW
+MODEST_TYPE_EDIT_MSG_WINDOW
+modest_edit_msg_window_get_type
+MODEST_EDIT_MSG_WINDOW_CLASS
+MODEST_IS_EDIT_MSG_WINDOW_CLASS
+MODEST_EDIT_MSG_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -666,9 +602,7 @@ MODEST_TOOLBAR_GET_CLASS
 ModestFolderView
 modest_folder_view_new
 modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
+modest_folder_view_get_selected
 <SUBSECTION Standard>
 MODEST_FOLDER_VIEW
 MODEST_IS_FOLDER_VIEW
@@ -697,6 +631,21 @@ MODEST_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-msg-view</FILE>
 <TITLE>ModestMsgView</TITLE>
 ModestMsgView
@@ -713,6 +662,24 @@ MODEST_MSG_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
+modest_window_get_account_store
+modest_window_get_widget_factory
+<SUBSECTION Standard>
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-account-assistant</FILE>
 <TITLE>ModestAccountAssistant</TITLE>
 ModestAccountAssistant
@@ -743,26 +710,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_requires_auth
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -782,60 +729,23 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-modest_main_window_get_widget_factory
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-attachment</FILE>
-<TITLE>ModestTnyAttachment</TITLE>
-ModestTnyAttachment
-modest_tny_attachment_new
-modest_tny_attachment_set_name
-modest_tny_attachment_get_name
-modest_tny_attachment_set_filename
-modest_tny_attachment_get_filename
-modest_tny_attachment_set_mime_type
-modest_tny_attachment_get_mime_type
-modest_tny_attachment_guess_mime_type
-modest_tny_attachment_get_stream
-modest_tny_attachment_free_list
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_requires_auth
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_TNY_ATTACHMENT
-MODEST_IS_TNY_ATTACHMENT
-MODEST_TYPE_TNY_ATTACHMENT
-modest_tny_attachment_get_type
-MODEST_TNY_ATTACHMENT_CLASS
-MODEST_IS_TNY_ATTACHMENT_CLASS
-MODEST_TNY_ATTACHMENT_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -844,6 +754,7 @@ MODEST_TNY_ATTACHMENT_GET_CLASS
 ModestUI
 modest_ui_new
 modest_ui_main_window
+modest_ui_edit_window
 <SUBSECTION Standard>
 MODEST_UI
 MODEST_IS_UI
@@ -864,11 +775,11 @@ modest_account_mgr_new
 modest_account_mgr_add_account
 modest_account_mgr_add_server_account
 modest_account_mgr_remove_account
+modest_account_mgr_get_account_data
+modest_account_mgr_free_account_data
 modest_account_mgr_account_names
 modest_account_mgr_search_server_accounts
 modest_account_mgr_account_exists
-modest_account_mgr_get_account_data
-modest_account_mgr_free_account_data
 modest_account_mgr_account_set_enabled
 modest_account_mgr_account_get_enabled
 modest_account_mgr_get_string
@@ -891,39 +802,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-protocol-mgr</FILE>
-<TITLE>ModestProtocolMgr</TITLE>
-ModestProtocolMgr
-MODEST_PROTOCOL_TRANSPORT_SENDMAIL
-MODEST_PROTOCOL_TRANSPORT_SMTP
-MODEST_PROTOCOL_STORE_NONE
-MODEST_PROTOCOL_STORE_POP
-MODEST_PROTOCOL_STORE_IMAP
-MODEST_PROTOCOL_STORE_MAILDIR
-MODEST_PROTOCOL_STORE_MBOX
-MODEST_PROTOCOL_SECURITY_NONE
-MODEST_PROTOCOL_SECURITY_SSL
-MODEST_PROTOCOL_SECURITY_TLS
-MODEST_PROTOCOL_AUTH_NONE
-MODEST_PROTOCOL_AUTH_PASSWORD
-ModestProtocolType
-modest_protocol_mgr_new
-modest_protocol_mgr_get_transport_protocols
-modest_protocol_mgr_get_store_protocols
-modest_protocol_mgr_get_security_protocols
-modest_protocol_mgr_get_auth_protocols
-modest_protocol_mgr_protocol_is_valid
-<SUBSECTION Standard>
-MODEST_PROTOCOL_MGR
-MODEST_IS_PROTOCOL_MGR
-MODEST_TYPE_PROTOCOL_MGR
-modest_protocol_mgr_get_type
-MODEST_PROTOCOL_MGR_CLASS
-MODEST_IS_PROTOCOL_MGR_CLASS
-MODEST_PROTOCOL_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-conf</FILE>
 ModestConfValueType
 ModestConfEvent
@@ -955,13 +833,32 @@ MODEST_CONF_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-formatter</FILE>
+<TITLE>ModestFormatter</TITLE>
+ModestFormatter
+modest_formatter_new
+modest_formatter_cite
+modest_formatter_quote
+modest_formatter_inline
+modest_formatter_attach
+<SUBSECTION Standard>
+MODEST_FORMATTER
+MODEST_IS_FORMATTER
+MODEST_TYPE_FORMATTER
+modest_formatter_get_type
+MODEST_FORMATTER_CLASS
+MODEST_IS_FORMATTER_CLASS
+MODEST_FORMATTER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-tny-platform-factory</FILE>
 <TITLE>ModestTnyPlatformFactory</TITLE>
 ModestTnyPlatformFactory
 modest_tny_platform_factory_get_instance
-modest_tny_platform_factory_get_modest_account_mgr_instance
-modest_tny_platform_factory_get_modest_conf_instance
-modest_tny_platform_factory_get_modest_mail_operation_queue_instance
+modest_tny_platform_factory_get_account_mgr_instance
+modest_tny_platform_factory_get_conf_instance
+modest_tny_platform_factory_get_mail_operation_queue_instance
 <SUBSECTION Standard>
 MODEST_TNY_PLATFORM_FACTORY
 MODEST_IS_TNY_PLATFORM_FACTORY
@@ -992,40 +889,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-formatter</FILE>
-<TITLE>ModestFormatter</TITLE>
-ModestFormatter
-modest_formatter_new
-modest_formatter_cite
-modest_formatter_quote
-modest_formatter_inline
-modest_formatter_attach
-<SUBSECTION Standard>
-MODEST_FORMATTER
-MODEST_IS_FORMATTER
-MODEST_TYPE_FORMATTER
-modest_formatter_get_type
-MODEST_FORMATTER_CLASS
-MODEST_IS_FORMATTER_CLASS
-MODEST_FORMATTER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-stream-gtkhtml</FILE>
-<TITLE>ModestTnyStreamGtkhtml</TITLE>
-ModestTnyStreamGtkhtml
-modest_tny_stream_gtkhtml_new
-<SUBSECTION Standard>
-MODEST_TNY_STREAM_GTKHTML
-MODEST_IS_TNY_STREAM_GTKHTML
-MODEST_TYPE_TNY_STREAM_GTKHTML
-modest_tny_stream_gtkhtml_get_type
-MODEST_TNY_STREAM_GTKHTML_CLASS
-MODEST_IS_TNY_STREAM_GTKHTML_CLASS
-MODEST_TNY_STREAM_GTKHTML_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-mail-operation</FILE>
 ModestMailOperationForwardType
 ModestMailOperationReplyType
@@ -1078,8 +941,6 @@ modest_widget_factory_get_status_bar
 modest_widget_factory_get_combo_box
 modest_widget_factory_get_online_toggle
 modest_widget_factory_get_folder_info_label
-modest_widget_factory_get_main_toolbar
-modest_widget_factory_get_edit_toolbar
 <SUBSECTION Standard>
 MODEST_WIDGET_FACTORY
 MODEST_IS_WIDGET_FACTORY
@@ -1138,6 +999,25 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-store-widget</FILE>
+<TITLE>ModestStoreWidget</TITLE>
+ModestStoreWidget
+modest_store_widget_new
+modest_store_widget_get_remember_password
+modest_store_widget_get_username
+modest_store_widget_get_servername
+modest_store_widget_get_proto
+<SUBSECTION Standard>
+MODEST_STORE_WIDGET
+MODEST_IS_STORE_WIDGET
+MODEST_TYPE_STORE_WIDGET
+modest_store_widget_get_type
+MODEST_STORE_WIDGET_CLASS
+MODEST_IS_STORE_WIDGET_CLASS
+MODEST_STORE_WIDGET_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-transport-widget</FILE>
 <TITLE>ModestTransportWidget</TITLE>
 ModestTransportWidget
@@ -1158,58 +1038,6 @@ MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-store-widget</FILE>
-<TITLE>ModestStoreWidget</TITLE>
-ModestStoreWidget
-modest_store_widget_new
-modest_store_widget_get_remember_password
-modest_store_widget_get_username
-modest_store_widget_get_servername
-modest_store_widget_get_proto
-<SUBSECTION Standard>
-MODEST_STORE_WIDGET
-MODEST_IS_STORE_WIDGET
-MODEST_TYPE_STORE_WIDGET
-modest_store_widget_get_type
-MODEST_STORE_WIDGET_CLASS
-MODEST_IS_STORE_WIDGET_CLASS
-MODEST_STORE_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-modest_edit_msg_window_set_msg
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-modest_main_window_get_widget_factory
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-account-assistant</FILE>
 <TITLE>ModestAccountAssistant</TITLE>
 ModestAccountAssistant
@@ -1240,25 +1068,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-transport-widget</FILE>
-<TITLE>ModestTransportWidget</TITLE>
-ModestTransportWidget
-modest_transport_widget_new
-modest_transport_widget_get_remember_password
-modest_transport_widget_get_username
-modest_transport_widget_get_servername
-modest_transport_widget_get_proto
-<SUBSECTION Standard>
-MODEST_TRANSPORT_WIDGET
-MODEST_IS_TRANSPORT_WIDGET
-MODEST_TYPE_TRANSPORT_WIDGET
-modest_transport_widget_get_type
-MODEST_TRANSPORT_WIDGET_CLASS
-MODEST_IS_TRANSPORT_WIDGET_CLASS
-MODEST_TRANSPORT_WIDGET_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>modest-store-widget</FILE>
 <TITLE>ModestStoreWidget</TITLE>
 ModestStoreWidget
@@ -1278,50 +1087,22 @@ MODEST_STORE_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-edit-msg-window</FILE>
-<TITLE>ModestEditMsgWindow</TITLE>
-ModestEditMsgWindow
-ModestEditType
-modest_edit_msg_window_new
-<SUBSECTION Standard>
-MODEST_EDIT_MSG_WINDOW
-MODEST_IS_EDIT_MSG_WINDOW
-MODEST_TYPE_EDIT_MSG_WINDOW
-modest_edit_msg_window_get_type
-MODEST_EDIT_MSG_WINDOW_CLASS
-MODEST_IS_EDIT_MSG_WINDOW_CLASS
-MODEST_EDIT_MSG_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-view</FILE>
-<TITLE>ModestAccountView</TITLE>
-ModestAccountView
-modest_account_view_new
-modest_account_view_get_selected_account
+<FILE>modest-transport-widget</FILE>
+<TITLE>ModestTransportWidget</TITLE>
+ModestTransportWidget
+modest_transport_widget_new
+modest_transport_widget_get_remember_password
+modest_transport_widget_get_username
+modest_transport_widget_get_servername
+modest_transport_widget_get_proto
 <SUBSECTION Standard>
-MODEST_ACCOUNT_VIEW
-MODEST_IS_ACCOUNT_VIEW
-MODEST_TYPE_ACCOUNT_VIEW
-modest_account_view_get_type
-MODEST_ACCOUNT_VIEW_CLASS
-MODEST_IS_ACCOUNT_VIEW_CLASS
-MODEST_ACCOUNT_VIEW_GET_CLASS
+MODEST_TRANSPORT_WIDGET
+MODEST_IS_TRANSPORT_WIDGET
+MODEST_TYPE_TRANSPORT_WIDGET
+modest_transport_widget_get_type
+MODEST_TRANSPORT_WIDGET_CLASS
+MODEST_IS_TRANSPORT_WIDGET_CLASS
+MODEST_TRANSPORT_WIDGET_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1340,6 +1121,8 @@ modest_header_view_get_columns
 modest_header_view_set_style
 modest_header_view_get_style
 modest_header_view_get_selected_headers
+modest_header_view_is_empty
+modest_header_view_select_next
 <SUBSECTION Standard>
 MODEST_HEADER_VIEW
 MODEST_IS_HEADER_VIEW
@@ -1351,19 +1134,54 @@ MODEST_HEADER_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-toolbar</FILE>
-ModestToolbarButton
-<TITLE>ModestToolbar</TITLE>
-ModestToolbar
-modest_toolbar_new
+<FILE>modest-account-view</FILE>
+<TITLE>ModestAccountView</TITLE>
+ModestAccountView
+modest_account_view_new
+modest_account_view_get_selected_account
+<SUBSECTION Standard>
+MODEST_ACCOUNT_VIEW
+MODEST_IS_ACCOUNT_VIEW
+MODEST_TYPE_ACCOUNT_VIEW
+modest_account_view_get_type
+MODEST_ACCOUNT_VIEW_CLASS
+MODEST_IS_ACCOUNT_VIEW_CLASS
+MODEST_ACCOUNT_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-stream-gtkhtml</FILE>
+<TITLE>ModestTnyStreamGtkhtml</TITLE>
+ModestTnyStreamGtkhtml
+modest_tny_stream_gtkhtml_new
+<SUBSECTION Standard>
+MODEST_TNY_STREAM_GTKHTML
+MODEST_IS_TNY_STREAM_GTKHTML
+MODEST_TYPE_TNY_STREAM_GTKHTML
+modest_tny_stream_gtkhtml_get_type
+MODEST_TNY_STREAM_GTKHTML_CLASS
+MODEST_IS_TNY_STREAM_GTKHTML_CLASS
+MODEST_TNY_STREAM_GTKHTML_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>modest-edit-msg-window</FILE>
+<TITLE>ModestEditMsgWindow</TITLE>
+ModestEditMsgWindow
+ModestEditType
+MsgData
+modest_edit_msg_window_new
+modest_edit_msg_window_set_msg
+modest_edit_msg_window_get_msg_data
+modest_edit_msg_window_free_msg_data
 <SUBSECTION Standard>
-MODEST_TOOLBAR
-MODEST_IS_TOOLBAR
-MODEST_TYPE_TOOLBAR
-modest_toolbar_get_type
-MODEST_TOOLBAR_CLASS
-MODEST_IS_TOOLBAR_CLASS
-MODEST_TOOLBAR_GET_CLASS
+MODEST_EDIT_MSG_WINDOW
+MODEST_IS_EDIT_MSG_WINDOW
+MODEST_TYPE_EDIT_MSG_WINDOW
+modest_edit_msg_window_get_type
+MODEST_EDIT_MSG_WINDOW_CLASS
+MODEST_IS_EDIT_MSG_WINDOW_CLASS
+MODEST_EDIT_MSG_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -1372,9 +1190,7 @@ MODEST_TOOLBAR_GET_CLASS
 ModestFolderView
 modest_folder_view_new
 modest_folder_view_set_title
-modest_folder_view_is_empty
-modest_folder_view_guess_folder_type
-modest_folder_view_get_selected_account
+modest_folder_view_get_selected
 <SUBSECTION Standard>
 MODEST_FOLDER_VIEW
 MODEST_IS_FOLDER_VIEW
@@ -1403,6 +1219,21 @@ MODEST_COMBO_BOX_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>modest-main-window</FILE>
+<TITLE>ModestMainWindow</TITLE>
+ModestMainWindow
+modest_main_window_new
+<SUBSECTION Standard>
+MODEST_MAIN_WINDOW
+MODEST_IS_MAIN_WINDOW
+MODEST_TYPE_MAIN_WINDOW
+modest_main_window_get_type
+MODEST_MAIN_WINDOW_CLASS
+MODEST_IS_MAIN_WINDOW_CLASS
+MODEST_MAIN_WINDOW_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>modest-msg-view</FILE>
 <TITLE>ModestMsgView</TITLE>
 ModestMsgView
@@ -1419,35 +1250,25 @@ MODEST_MSG_VIEW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-store-actions</FILE>
-modest_tny_store_actions_create_folder
-modest_tny_store_actions_remove_folder
-modest_tny_store_actions_rename_folder
-modest_tny_store_actions_move_folder
+<FILE>modest-window</FILE>
+ModestWindowParent
+ModestWindowParentClass
+<TITLE>ModestWindow</TITLE>
+ModestWindow
+modest_window_get_account_store
+modest_window_get_widget_factory
+<SUBSECTION Standard>
+MODEST_WINDOW
+MODEST_IS_WINDOW
+MODEST_TYPE_WINDOW
+modest_window_get_type
+MODEST_WINDOW_CLASS
+MODEST_IS_WINDOW_CLASS
+MODEST_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-keys</FILE>
-MODEST_CONF_DEFAULT_ACCOUNT
-MODEST_ACCOUNT_NAMESPACE
-MODEST_SERVER_ACCOUNT_NAMESPACE
-MODEST_CONF_REPLY_TYPE
-MODEST_CONF_FORWARD_TYPE
-MODEST_ACCOUNT_DISPLAY_NAME
-MODEST_ACCOUNT_STORE_ACCOUNT
-MODEST_ACCOUNT_TRANSPORT_ACCOUNT
-MODEST_ACCOUNT_FULLNAME
-MODEST_ACCOUNT_EMAIL
-MODEST_ACCOUNT_PASSWORD
-MDOEST_ACCOUNT_REMEMBER_PWD
-MODEST_ACCOUNT_HOSTNAME
-MODEST_ACCOUNT_USERNAME
-MODEST_ACCOUNT_PROTO
-MODEST_ACCOUNT_ENABLED
-MODEST_ACCOUNT_TYPE
-MODEST_ACCOUNT_LEAVE_ON_SERVER
-MODEST_ACCOUNT_PREFERRED_CNX
-MODEST_ACCOUNT_OPTIONS
+<FILE>modest-ui-actions</FILE>
 </SECTION>
 
 <SECTION>
@@ -1463,6 +1284,15 @@ modest_text_utils_get_display_address
 modest_text_utils_get_subject_prefix_len
 modest_text_utils_utf8_strcmp
 modest_text_utils_get_display_date
+modest_text_utils_validate_email_address
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-folder</FILE>
+ModestTnyFolderRules
+modest_tny_folder_guess_folder_type
+modest_tny_folder_guess_folder_type_from_name
+modest_tny_folder_get_rules
 </SECTION>
 
 <SECTION>
@@ -1479,9 +1309,10 @@ modest_presets_destroy
 <SECTION>
 <FILE>modest-pair</FILE>
 ModestPair
+ModestPairList
 modest_pair_new
-modest_pair_destroy
-modest_pair_gslist_destroy
+modest_pair_free
+modest_pair_list_free
 </SECTION>
 
 <SECTION>
@@ -1495,53 +1326,77 @@ modest_icon_factory_get_big_icon
 </SECTION>
 
 <SECTION>
-<FILE>modest-conf-keys</FILE>
+<FILE>modest-defs</FILE>
+MODEST_DIR
+MODEST_CACHE_DIR
+MODEST_LOCAL_FOLDERS_MAILDIR
 MODEST_CONF_NAMESPACE
 MODEST_CONF_WIDGET_NAMESPACE
-MODEST_MAIN_WINDOW_HEIGHT
-MODEST_MAIN_WINDOW_HEIGHT_DEFAULT
-MODEST_MAIN_WINDOW_WIDTH
-MODEST_MAIN_WINDOW_WIDTH_DEFAULT
-MODEST_MAIN_PANED_HEIGHT
-MODEST_MAIN_PANED_HEIGHT_DEFAULT
-MODEST_FOLDER_PANED_WIDTH
-MODEST_FOLDER_PANED_WIDTH_DEFAULT
-MODEST_FOLDER_PANED_DIVIDER_POS
-MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT
-MODEST_MSG_PANED_WIDTH
-MODEST_MSG_PANED_WIDTH_DEFAULT
-MODEST_MSG_PANED_DIVIDER_POS
-MODEST_MSG_PANED_DIVIDER_POS_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT
-MODEST_EDIT_WINDOW_HEIGHT
-MODEST_EDIT_WINDOW_HEIGHT_DEFAULT
-MODEST_EDIT_WINDOW_WIDTH
-MODEST_EDIT_WINDOW_WIDTH_DEFAULT
-MODEST_MSG_VIEW_NAMESPACE
-MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE
-</SECTION>
-
-<SECTION>
-<FILE>modest-proto</FILE>
-MODEST_PROTO_SENDMAIL
-MODEST_PROTO_SMTP
-MODEST_PROTO_NONE
-MODEST_PROTO_POP
-MODEST_PROTO_IMAP
-MODEST_PROTO_MAILDIR
-MODEST_PROTO_MBOX
-MODEST_SECURITY_PROTO_NONE
-MODEST_SECURITY_PROTO_SSL
-MODEST_SECURITY_PROTO_TLS
-MODEST_AUTH_PROTO_PASSWORD
-ModestProtoType
-modest_proto_is_valid
-modest_proto_type
-modest_proto_store_protos
-modest_proto_transport_protos
-modest_proto_security_protos
-modest_proto_auth_protos
+MODEST_ACCOUNT_NAMESPACE
+MODEST_SERVER_ACCOUNT_NAMESPACE
+MODEST_CONF_REPLY_TYPE
+MODEST_CONF_FORWARD_TYPE
+MODEST_ACCOUNT_DISPLAY_NAME
+MODEST_ACCOUNT_STORE_ACCOUNT
+MODEST_ACCOUNT_TRANSPORT_ACCOUNT
+MODEST_ACCOUNT_FULLNAME
+MODEST_ACCOUNT_EMAIL
+MODEST_ACCOUNT_PASSWORD
+MDOEST_ACCOUNT_REMEMBER_PWD
+MODEST_ACCOUNT_HOSTNAME
+MODEST_ACCOUNT_USERNAME
+MODEST_ACCOUNT_PROTO
+MODEST_ACCOUNT_ENABLED
+MODEST_ACCOUNT_TYPE
+MODEST_ACCOUNT_LEAVE_ON_SERVER
+MODEST_ACCOUNT_PREFERRED_CNX
+MODEST_ACCOUNT_OPTIONS
+</SECTION>
+
+<SECTION>
+<FILE>modest-debug</FILE>
+MODEST_DEBUG
+ModestDebugFlags
+modest_debug_get_flags
+modest_debug_g_type_init
+modest_debug_logging_init
+</SECTION>
+
+<SECTION>
+<FILE>modest-error</FILE>
+ModestErrorDomain
+ModestErrorCode
+</SECTION>
+
+<SECTION>
+<FILE>modest-widget-memory</FILE>
+modest_widget_memory_save
+modest_widget_memory_restore
+</SECTION>
+
+<SECTION>
+<FILE>modest-protocol-info</FILE>
+ModestProtocol
+ModestProtocolType
+modest_protocol_info_get_protocol_list
+modest_protocol_info_get_protocol_pair_list
+modest_protocol_info_get_protocol_type
+modest_protocol_info_get_protocol
+modest_protocol_info_get_protocol_name
+modest_protocol_info_get_protocol_display_name
+modest_protocol_info_protocol_is_local_store
+</SECTION>
+
+<SECTION>
+<FILE>modest-ui-priv</FILE>
+ModestUIPrivate
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-msg-actions</FILE>
+modest_tny_msg_actions_find_body_part
+modest_tny_msg_actions_find_nth_part
+modest_tny_msg_actions_find_body
 </SECTION>
 
 <SECTION>
@@ -1560,27 +1415,32 @@ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
 </SECTION>
 
 <SECTION>
-<FILE>modest-widget-memory</FILE>
-modest_widget_memory_save
-modest_widget_memory_restore
+<FILE>modest-init</FILE>
+modest_init_header_columns
+modest_init_local_folders
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-msg-actions</FILE>
-modest_tny_msg_actions_find_body_part
-modest_tny_msg_actions_find_nth_part
-modest_tny_msg_actions_find_body
+<FILE>modest-local-folder-info</FILE>
+ModestLocalFolderType
+modest_local_folder_info_get_type
+modest_local_folder_info_get_type_name
+modest_local_folder_info_get_type_display_name
+modest_local_folder_info_get_maildir_path
 </SECTION>
 
 <SECTION>
-<FILE>modest-error</FILE>
-ModestErrorDomain
-ModestErrorCode
+<FILE>modest-widget-memory-priv</FILE>
+MODEST_WIDGET_MEMORY_PARAM_X
+MODEST_WIDGET_MEMORY_PARAM_Y
+MODEST_WIDGET_MEMORY_PARAM_HEIGHT
+MODEST_WIDGET_MEMORY_PARAM_WIDTH
+MODEST_WIDGET_MEMORY_PARAM_POS
+MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1622,18 +1482,7 @@ MODEST_STOCK_STOP
 </SECTION>
 
 <SECTION>
-<FILE>modest-ui-actions</FILE>
-modest_ui_actions_on_about
-modest_ui_actions_on_delete
-modest_ui_actions_on_quit
-modest_ui_actions_on_accounts
-modest_ui_actions_on_new_msg
-modest_ui_actions_on_reply_forward
-</SECTION>
-
-<SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1662,6 +1511,20 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
@@ -1669,39 +1532,77 @@ MODEST_TOOLBAR_ICON_STOP
 </SECTION>
 
 <SECTION>
+<FILE>modest-edit-msg-window-ui</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
+</SECTION>
+
+<SECTION>
 <FILE>modest-header-view-priv</FILE>
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-store-actions</FILE>
-modest_tny_store_actions_create_folder
-modest_tny_store_actions_remove_folder
-modest_tny_store_actions_rename_folder
-modest_tny_store_actions_move_folder
+<FILE>modest-edit-msg-window-ui</FILE>
 </SECTION>
 
 <SECTION>
-<FILE>modest-account-keys</FILE>
-MODEST_CONF_DEFAULT_ACCOUNT
-MODEST_ACCOUNT_NAMESPACE
-MODEST_SERVER_ACCOUNT_NAMESPACE
-MODEST_CONF_REPLY_TYPE
-MODEST_CONF_FORWARD_TYPE
-MODEST_ACCOUNT_DISPLAY_NAME
-MODEST_ACCOUNT_STORE_ACCOUNT
-MODEST_ACCOUNT_TRANSPORT_ACCOUNT
-MODEST_ACCOUNT_FULLNAME
-MODEST_ACCOUNT_EMAIL
-MODEST_ACCOUNT_PASSWORD
-MDOEST_ACCOUNT_REMEMBER_PWD
-MODEST_ACCOUNT_HOSTNAME
-MODEST_ACCOUNT_USERNAME
-MODEST_ACCOUNT_PROTO
-MODEST_ACCOUNT_ENABLED
-MODEST_ACCOUNT_TYPE
-MODEST_ACCOUNT_LEAVE_ON_SERVER
-MODEST_ACCOUNT_PREFERRED_CNX
-MODEST_ACCOUNT_OPTIONS
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+
+<SECTION>
+<FILE>modest-icon-names</FILE>
+MODEST_APP_ICON
+MODEST_HEADER_ICON_READ
+MODEST_HEADER_ICON_UNREAD
+MODEST_HEADER_ICON_DELETED
+MODEST_HEADER_ICON_ATTACH
+MODEST_FOLDER_ICON_OPEN
+MODEST_FOLDER_ICON_CLOSED
+MODEST_FOLDER_ICON_ACCOUNT
+MODEST_FOLDER_ICON_INBOX
+MODEST_FOLDER_ICON_OUTBOX
+MODEST_FOLDER_ICON_SENT
+MODEST_FOLDER_ICON_TRASH
+MODEST_FOLDER_ICON_JUNK
+MODEST_FOLDER_ICON_DRAFTS
+MODEST_FOLDER_ICON_NORMAL
+MODEST_FOLDER_ICON_CONTACTS
+MODEST_FOLDER_ICON_NOTES
+MODEST_FOLDER_ICON_CALENDAR
+MODEST_TOOLBAR_ICON_MAIL_SEND
+MODEST_TOOLBAR_ICON_NEW_MAIL
+MODEST_TOOLBAR_ICON_SEND_RECEIVE
+MODEST_TOOLBAR_ICON_REPLY
+MODEST_TOOLBAR_ICON_REPLY_ALL
+MODEST_TOOLBAR_ICON_FORWARD
+MODEST_TOOLBAR_ICON_DELETE
+MODEST_TOOLBAR_ICON_NEXT
+MODEST_TOOLBAR_ICON_PREV
+MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-ui-actions</FILE>
 </SECTION>
 
 <SECTION>
@@ -1717,6 +1618,15 @@ modest_text_utils_get_display_address
 modest_text_utils_get_subject_prefix_len
 modest_text_utils_utf8_strcmp
 modest_text_utils_get_display_date
+modest_text_utils_validate_email_address
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-folder</FILE>
+ModestTnyFolderRules
+modest_tny_folder_guess_folder_type
+modest_tny_folder_guess_folder_type_from_name
+modest_tny_folder_get_rules
 </SECTION>
 
 <SECTION>
@@ -1733,9 +1643,10 @@ modest_presets_destroy
 <SECTION>
 <FILE>modest-pair</FILE>
 ModestPair
+ModestPairList
 modest_pair_new
-modest_pair_destroy
-modest_pair_gslist_destroy
+modest_pair_free
+modest_pair_list_free
 </SECTION>
 
 <SECTION>
@@ -1749,53 +1660,77 @@ modest_icon_factory_get_big_icon
 </SECTION>
 
 <SECTION>
-<FILE>modest-conf-keys</FILE>
+<FILE>modest-defs</FILE>
+MODEST_DIR
+MODEST_CACHE_DIR
+MODEST_LOCAL_FOLDERS_MAILDIR
 MODEST_CONF_NAMESPACE
 MODEST_CONF_WIDGET_NAMESPACE
-MODEST_MAIN_WINDOW_HEIGHT
-MODEST_MAIN_WINDOW_HEIGHT_DEFAULT
-MODEST_MAIN_WINDOW_WIDTH
-MODEST_MAIN_WINDOW_WIDTH_DEFAULT
-MODEST_MAIN_PANED_HEIGHT
-MODEST_MAIN_PANED_HEIGHT_DEFAULT
-MODEST_FOLDER_PANED_WIDTH
-MODEST_FOLDER_PANED_WIDTH_DEFAULT
-MODEST_FOLDER_PANED_DIVIDER_POS
-MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT
-MODEST_MSG_PANED_WIDTH
-MODEST_MSG_PANED_WIDTH_DEFAULT
-MODEST_MSG_PANED_DIVIDER_POS
-MODEST_MSG_PANED_DIVIDER_POS_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT
-MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT
-MODEST_EDIT_WINDOW_HEIGHT
-MODEST_EDIT_WINDOW_HEIGHT_DEFAULT
-MODEST_EDIT_WINDOW_WIDTH
-MODEST_EDIT_WINDOW_WIDTH_DEFAULT
-MODEST_MSG_VIEW_NAMESPACE
-MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE
-</SECTION>
-
-<SECTION>
-<FILE>modest-proto</FILE>
-MODEST_PROTO_SENDMAIL
-MODEST_PROTO_SMTP
-MODEST_PROTO_NONE
-MODEST_PROTO_POP
-MODEST_PROTO_IMAP
-MODEST_PROTO_MAILDIR
-MODEST_PROTO_MBOX
-MODEST_SECURITY_PROTO_NONE
-MODEST_SECURITY_PROTO_SSL
-MODEST_SECURITY_PROTO_TLS
-MODEST_AUTH_PROTO_PASSWORD
-ModestProtoType
-modest_proto_is_valid
-modest_proto_type
-modest_proto_store_protos
-modest_proto_transport_protos
-modest_proto_security_protos
-modest_proto_auth_protos
+MODEST_ACCOUNT_NAMESPACE
+MODEST_SERVER_ACCOUNT_NAMESPACE
+MODEST_CONF_REPLY_TYPE
+MODEST_CONF_FORWARD_TYPE
+MODEST_ACCOUNT_DISPLAY_NAME
+MODEST_ACCOUNT_STORE_ACCOUNT
+MODEST_ACCOUNT_TRANSPORT_ACCOUNT
+MODEST_ACCOUNT_FULLNAME
+MODEST_ACCOUNT_EMAIL
+MODEST_ACCOUNT_PASSWORD
+MDOEST_ACCOUNT_REMEMBER_PWD
+MODEST_ACCOUNT_HOSTNAME
+MODEST_ACCOUNT_USERNAME
+MODEST_ACCOUNT_PROTO
+MODEST_ACCOUNT_ENABLED
+MODEST_ACCOUNT_TYPE
+MODEST_ACCOUNT_LEAVE_ON_SERVER
+MODEST_ACCOUNT_PREFERRED_CNX
+MODEST_ACCOUNT_OPTIONS
+</SECTION>
+
+<SECTION>
+<FILE>modest-debug</FILE>
+MODEST_DEBUG
+ModestDebugFlags
+modest_debug_get_flags
+modest_debug_g_type_init
+modest_debug_logging_init
+</SECTION>
+
+<SECTION>
+<FILE>modest-error</FILE>
+ModestErrorDomain
+ModestErrorCode
+</SECTION>
+
+<SECTION>
+<FILE>modest-widget-memory</FILE>
+modest_widget_memory_save
+modest_widget_memory_restore
+</SECTION>
+
+<SECTION>
+<FILE>modest-protocol-info</FILE>
+ModestProtocol
+ModestProtocolType
+modest_protocol_info_get_protocol_list
+modest_protocol_info_get_protocol_pair_list
+modest_protocol_info_get_protocol_type
+modest_protocol_info_get_protocol
+modest_protocol_info_get_protocol_name
+modest_protocol_info_get_protocol_display_name
+modest_protocol_info_protocol_is_local_store
+</SECTION>
+
+<SECTION>
+<FILE>modest-ui-priv</FILE>
+ModestUIPrivate
+</SECTION>
+
+<SECTION>
+<FILE>modest-tny-msg-actions</FILE>
+modest_tny_msg_actions_find_body_part
+modest_tny_msg_actions_find_nth_part
+modest_tny_msg_actions_find_body
 </SECTION>
 
 <SECTION>
@@ -1814,27 +1749,32 @@ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
 </SECTION>
 
 <SECTION>
-<FILE>modest-widget-memory</FILE>
-modest_widget_memory_save
-modest_widget_memory_restore
+<FILE>modest-init</FILE>
+modest_init_header_columns
+modest_init_local_folders
 </SECTION>
 
 <SECTION>
-<FILE>modest-tny-msg-actions</FILE>
-modest_tny_msg_actions_find_body_part
-modest_tny_msg_actions_find_nth_part
-modest_tny_msg_actions_find_body
+<FILE>modest-local-folder-info</FILE>
+ModestLocalFolderType
+modest_local_folder_info_get_type
+modest_local_folder_info_get_type_name
+modest_local_folder_info_get_type_display_name
+modest_local_folder_info_get_maildir_path
 </SECTION>
 
 <SECTION>
-<FILE>modest-error</FILE>
-ModestErrorDomain
-ModestErrorCode
+<FILE>modest-widget-memory-priv</FILE>
+MODEST_WIDGET_MEMORY_PARAM_X
+MODEST_WIDGET_MEMORY_PARAM_Y
+MODEST_WIDGET_MEMORY_PARAM_HEIGHT
+MODEST_WIDGET_MEMORY_PARAM_WIDTH
+MODEST_WIDGET_MEMORY_PARAM_POS
+MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
 </SECTION>
 
 <SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1876,18 +1816,7 @@ MODEST_STOCK_STOP
 </SECTION>
 
 <SECTION>
-<FILE>modest-ui-actions</FILE>
-modest_ui_actions_on_about
-modest_ui_actions_on_delete
-modest_ui_actions_on_quit
-modest_ui_actions_on_accounts
-modest_ui_actions_on_new_msg
-modest_ui_actions_on_reply_forward
-</SECTION>
-
-<SECTION>
 <FILE>modest-icon-names</FILE>
-PIXMAP_PREFIX
 MODEST_APP_ICON
 MODEST_HEADER_ICON_READ
 MODEST_HEADER_ICON_UNREAD
@@ -1916,9 +1845,33 @@ MODEST_TOOLBAR_ICON_DELETE
 MODEST_TOOLBAR_ICON_NEXT
 MODEST_TOOLBAR_ICON_PREV
 MODEST_TOOLBAR_ICON_STOP
+MODEST_STOCK_MAIL_SEND
+MODEST_STOCK_NEW_MAIL
+MODEST_STOCK_SEND_RECEIVE
+MODEST_STOCK_REPLY
+MODEST_STOCK_REPLY_ALL
+MODEST_STOCK_FORWARD
+MODEST_STOCK_DELETE
+MODEST_STOCK_NEXT
+MODEST_STOCK_PREV
+MODEST_STOCK_STOP
+</SECTION>
+
+<SECTION>
+<FILE>modest-main-window-ui</FILE>
 </SECTION>
 
 <SECTION>
 <FILE>modest-header-view-priv</FILE>
 </SECTION>
 
+<SECTION>
+<FILE>modest-edit-msg-window-ui</FILE>
+</SECTION>
+
+<SECTION>
+<FILE>modest-window-priv</FILE>
+ModestWindowPrivate
+MODEST_WINDOW_GET_PRIVATE
+</SECTION>
+