X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.h;h=76fbe912b6e02f07cbd6eb684ce1ffdbe534ebda;hp=902e58b6f56c4d96524c089a4fcfed5482a188a8;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=d57f2c3462ad26c4758c033f91b2289ff8455137

diff --git a/src/modest-tny-account-store.h b/src/modest-tny-account-store.h
index 902e58b..76fbe91 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,12 +65,28 @@ 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);
+
+	/* Signals */
+	void (*account_changed) (TnyAccountStore *self, TnyAccount *account);
+	void (*account_inserted) (TnyAccountStore *self, TnyAccount *account);
+	void (*account_removed) (TnyAccountStore *self, TnyAccount *account);
 };
 
-/* member functions */
+typedef enum {
+	MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+	MODEST_TNY_ACCOUNT_STORE_QUERY_URL,
+} ModestTnyAccountStoreQueryType;
+
 
 /**
  * modest_tny_account_store_get_type:
@@ -86,46 +103,72 @@ 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 
+ * @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 str 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  (ModestTnyAccountStore *self,
+							  ModestTnyAccountStoreQueryType type,
+							  const gchar *str);
 
 /**
- * tny_account_store_get_local_folders_account 
+ * modest_tny_account_store_get_server_account
  * @self: a ModestTnyAccountStore instance
+ * @account_name: a modest account name
+ * @type: the tny account type (store or transport)
  * 
- * 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. TODO: Check that callers are unreffing.
  */
-TnyAccount*    modest_tny_account_store_get_local_folders_account    (ModestTnyAccountStore *self);
-
+TnyAccount* modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
+							 const gchar *account_name,
+							 TnyAccountType type);
 
 /**
- * tny_account_store_get_special_folder
+ * modest_tny_account_store_get_transport_account_for_open_connection
  * @self: a ModestTnyAccountStore instance
- * @type: some tny folder type
+ * @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);
+
+/**
+ * tny_account_store_get_session
+ * @self: a TnyAccountStore instance
  * 
- * get the special (Inbox,Outbox,Sent,Draft etc.) folder for this 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: the tny folder corresponding to this special folder, or NULL
+ * Returns: a tny-camel-session
  */
-TnyFolder*    modest_tny_account_store_get_special_folder   (ModestTnyAccountStore *self,
-							     TnyAccount *account,
-							     TnyFolderType special_type);
+TnySessionCamel*    modest_tny_account_store_get_session    (TnyAccountStore *self);
+
+/** modest_tny_account_store_get_local_folders_account:
+ * @self: a TnyAccountStore instance
+ * 
+ * Get the user-visible local folders account.
+ **/
+TnyAccount * modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self);
 
 G_END_DECLS
 
 #endif /* __MODEST_TNY_ACCOUNT_STORE_H__ */
-