X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.h;h=76fbe912b6e02f07cbd6eb684ce1ffdbe534ebda;hp=17b29c311637148df7ccf2c49061edf062746ee1;hb=7691addfd0661f493672b2fab5274ca28612707d;hpb=702b748360f6de61e0780c36a98065d19a495c83

diff --git a/src/modest-tny-account-store.h b/src/modest-tny-account-store.h
index 17b29c3..76fbe91 100644
--- a/src/modest-tny-account-store.h
+++ b/src/modest-tny-account-store.h
@@ -34,9 +34,13 @@
 #define __MODEST_TNY_ACCOUNT_STORE_H__
 
 #include <glib-object.h>
+#include <modest-defs.h>
 #include <tny-account-store.h>
 #include <tny-session-camel.h>
 #include <tny-shared.h>
+#include <tny-folder.h>
+#include <modest-account-mgr.h>
+#include <modest-tny-local-folders-account.h>
 
 /* other include files */
 
@@ -61,62 +65,110 @@ struct _ModestTnyAccountStore {
 struct _ModestTnyAccountStoreClass {
 	GObjectClass parent_class;
 
-	void (*password_requested) (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:
  *
- * Returns: GType of account store
+ * Returns: GType of the account store
  */
-GType        modest_tny_account_store_get_type    (void) G_GNUC_CONST;
+GType  modest_tny_account_store_get_type   (void) G_GNUC_CONST;
 
 /**
  * modest_tny_account_store_new:
- * @modest_acc_mgr: account manager to use for new account store
+ * @account_mgr: account manager to use for new account store
  *
  * creates new (tinymail) account store for account manager modest_acc_mgr
  *
- * Returns: GObject of newly created account store
+ * Returns: newly created account store or NULL in case of error
  */
-GObject*    modest_tny_account_store_new         (ModestAccountMgr *modest_acc_mgr);
+ModestTnyAccountStore*    modest_tny_account_store_new (ModestAccountMgr *account_mgr,
+							TnyDevice *device);
+
 
 /**
- * modest_tny_account_store_get_account_mgr:
- * @self: a TnyAccountStore instance
- *
- * retrieve the account manager associated with this account store.
- *
- * Returns: the account manager for @self.
+ * modest_tny_account_store_get_account_by 
+ * @self: a ModestTnyAccountStore instance
+ * @id: some ID
+ * 
+ * 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
  */
-ModestAccountMgr *modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self);
+TnyAccount* modest_tny_account_store_get_tny_account_by  (ModestTnyAccountStore *self,
+							  ModestTnyAccountStoreQueryType type,
+							  const gchar *str);
 
 /**
- * tny_account_store_get_session:
- * @self: a TnyAccountStore instance
- *
- * retrieve current tinymail camel session
- *
- * Returns: current tinymail camel session
+ * 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)
+ * 
+ * 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.
  */
-TnySessionCamel* tny_account_store_get_session (TnyAccountStore *self);
+TnyAccount* modest_tny_account_store_get_server_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);
 
 /**
- * tny_account_store_set_get_pass_func:
+ * tny_account_store_get_session
  * @self: a TnyAccountStore instance
- * key: a key
- * func: a function
+ * 
+ * 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...
  *
- * set the password function to function
+ * Returns: a tny-camel-session
  */
-void
-modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *, ModestTnyGetPassFunc);
+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__ */
-