X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.h;h=17018a3ba0334187a926a5963b608ea33f377145;hp=5aedd90862404e95232a1e1c0a20b6e66d8deb9c;hb=40e92875620a12ce1d34126c9a9c6bce97b21e6c;hpb=b568d65a8d04489a2510e7bcdab00f024185c3e5

diff --git a/src/modest-tny-account-store.h b/src/modest-tny-account-store.h
index 5aedd90..17018a3 100644
--- a/src/modest-tny-account-store.h
+++ b/src/modest-tny-account-store.h
@@ -40,6 +40,7 @@
 #include <tny-shared.h>
 #include <tny-folder.h>
 #include <modest-account-mgr.h>
+#include <modest-tny-local-folders-account.h>
 
 /* other include files */
 
@@ -64,13 +65,18 @@ struct _ModestTnyAccountStore {
 struct _ModestTnyAccountStoreClass {
 	GObjectClass parent_class;
 
-	void (*account_update)    (ModestTnyAccountStore *self,
-				   const gchar *account_name,
-				   gpointer user_data);
+	void (*account_update)        (ModestTnyAccountStore *self,
+				      const gchar *account_name,
+				      gpointer user_data);
+	void (*password_requested)    (ModestTnyAccountStore *self,
+				       const gchar *server_account_name,
+				       gchar **username,
+				       gchar **password,
+				       gboolean *remember,
+				       gboolean *cancel,
+				       gpointer user_data);
 };
 
-/* member functions */
-
 /**
  * modest_tny_account_store_get_type:
  *
@@ -86,42 +92,74 @@ GType  modest_tny_account_store_get_type   (void) G_GNUC_CONST;
  *
  * Returns: newly created account store or NULL in case of error
  */
-ModestTnyAccountStore*    modest_tny_account_store_new (ModestAccountMgr *account_mgr);
+ModestTnyAccountStore*    modest_tny_account_store_new (ModestAccountMgr *account_mgr,
+							TnyDevice *device);
+
 
 /**
- * tny_account_store_get_session
- * @self: a TnyAccountStore instance
+ * modest_tny_account_store_get_account_by_id 
+ * @self: a ModestTnyAccountStore instance
+ * @id: some ID
  * 
- * get the tny-camel-session for this account store. Note that this function
- * does NOT have the modest_ prefix, as tinymail requires the symbol to be like this...
- *
- * Returns: a tny-camel-session
+ * get the account with the given ID or NULL if it's not found
+ * 
+ * Returns: the tnyaccount or NULL,
+ * g_object_unref when it's no longer needed
  */
-TnySessionCamel*    tny_account_store_get_session    (TnyAccountStore *self);
+TnyAccount* modest_tny_account_store_get_tny_account_by_id  (ModestTnyAccountStore *self,
+							     const gchar *id);
 
 /**
- * tny_account_store_get_local_folders_account 
+ * modest_tny_account_store_get_tny_account_by_account
  * @self: a ModestTnyAccountStore instance
+ * @account_name: an account name
+ * @type: the tny account type
  * 
- * return the account corresponding to the local folders
- *
- * Returns: the tnyaccount for the local folders
+ * Get the tny account corresponding to one of the server_accounts for account with @account_name
+ * 
+ * Returns: the tnyaccount for the server account or NULL in case it's not found or error,
+ * g_object_unref when it's no longer needed
  */
-TnyAccount*    modest_tny_account_store_get_local_folders_account    (ModestTnyAccountStore *self);
-
+TnyAccount* modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
+								 const gchar *account_name,
+								 TnyAccountType type);
+						     
+/**
+ * modest_tny_account_store_get_transport_account_for_open_connection
+ * @self: a ModestTnyAccountStore instance
+ * @account_name: an account name
+ * 
+ * Get the tny account corresponding to the transport server account for the account with @account_name,
+ * returning the connection-specific SMTP-server transport server account if one is specified,
+ * otherwise just returning the regular transport server account.
+ * 
+ * Returns: the tnyaccount for the server account or NULL in case it's not found or error,
+ * g_object_unref when it's no longer needed
+ */						 
+TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
+								 const gchar *account_name);
 
 /**
- * modest_tny_account_store_get_account_from_server_account
- * @server_account: the server account name
+ * tny_account_store_get_session
+ * @self: a TnyAccountStore instance
  * 
- * this function gets a reference to the #TnyAccount corresponding
- * to a given server account.
+ * get the tny-camel-session for this account store. Note that this function
+ * does NOT have the modest_ prefix, as tinymail requires the symbol to be like this...
  *
- * Returns: a  #TnyFolder corresponding to a given server account, or NULL in case
- * of error
+ * Returns: a tny-camel-session
  */
-TnyAccount*  modest_tny_account_store_get_tny_account_from_server_account
-                   (ModestTnyAccountStore *self, const gchar* server_account);
+TnySessionCamel*    modest_tny_account_store_get_session    (TnyAccountStore *self);
+
+
+/** modest_tny_account_is_virtual_local_folders:
+ * @self A TnyAccount.
+ * 
+ * A convenience function to identify whether TnyAccount 
+ * is the virtual local folders account, containing the folders from local_folders/
+ * and the outboxes from outboxes/<account-name>/.
+ **/
+gboolean modest_tny_account_is_virtual_local_folders (TnyAccount *self);
+
 G_END_DECLS
 
 #endif /* __MODEST_TNY_ACCOUNT_STORE_H__ */