X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.h;h=6b01a28128908b007860aae3801defac821df4b0;hp=0386769fe15a0892b61f3cded39ece231b4077c5;hb=622a810e13a3b84ecff6c620ae39c3828ea3214e;hpb=96d9a8c787c693406a0f26e3d3a00065c7236fe5

diff --git a/src/modest-tny-account-store.h b/src/modest-tny-account-store.h
index 0386769..6b01a28 100644
--- a/src/modest-tny-account-store.h
+++ b/src/modest-tny-account-store.h
@@ -39,8 +39,8 @@
 #include <tny-session-camel.h>
 #include <tny-shared.h>
 #include <tny-folder.h>
-#include <modest-tny-simple-folder-store.h>
 #include <modest-account-mgr.h>
+#include <modest-tny-local-folders-account.h>
 
 /* other include files */
 
@@ -77,6 +77,12 @@ struct _ModestTnyAccountStoreClass {
 				       gpointer user_data);
 };
 
+typedef enum {
+	MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+	MODEST_TNY_ACCOUNT_STORE_QUERY_URL,
+} ModestTnyAccountStoreQueryType;
+
+
 /**
  * modest_tny_account_store_get_type:
  *
@@ -97,33 +103,34 @@ ModestTnyAccountStore*    modest_tny_account_store_new (ModestAccountMgr *accoun
 
 
 /**
- * modest_tny_account_store_get_account_by_id 
+ * modest_tny_account_store_get_account_by 
  * @self: a ModestTnyAccountStore instance
  * @id: some ID
  * 
- * get the account with the given ID or NULL if it's not found
+ * 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
  */
-TnyAccount* modest_tny_account_store_get_tny_account_by_id  (ModestTnyAccountStore *self,
-							     const gchar *id);
+TnyAccount* modest_tny_account_store_get_tny_account_by  (ModestTnyAccountStore *self,
+							  ModestTnyAccountStoreQueryType type,
+							  const gchar *str);
 
 /**
- * modest_tny_account_store_get_tny_account_by_account
+ * modest_tny_account_store_get_server_account
  * @self: a ModestTnyAccountStore instance
- * @account_name: an account name
- * @type: the tny account type
+ * @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
+ * g_object_unref when it's no longer needed. TODO: Check that callers are unreffing.
  */
-TnyAccount* modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
-								 const gchar *account_name,
-								 TnyAccountType type);
-		
+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
@@ -137,7 +144,7 @@ TnyAccount* modest_tny_account_store_get_tny_account_by_account (ModestTnyAccoun
  * 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);
+										const gchar *account_name);
 
 /**
  * tny_account_store_get_session
@@ -150,15 +157,30 @@ TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (
  */
 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 (TnyAccountStore *self);
 
-/** modest_tny_folder_store_is_virtual_local_folders:
- * @self A TnyFolderStore.
+/** modest_tny_account_is_virtual_local_folders:
+ * @self A TnyAccount.
  * 
- * A convenience function to identify whether TnyAccount or other TnyFolderStore 
- * is the virtual local folders store, containing the folders from local_folders/
+ * 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_folder_store_is_virtual_local_folders (TnyFolderStore *self);
+gboolean modest_tny_account_is_virtual_local_folders (TnyAccount *self);
+
+/** modest_tny_account_is_memory_card_account:
+ * @self A TnyAccount.
+ * 
+ * A convenience function to identify whether TnyAccount 
+ * is the memory card account.
+ **/
+gboolean
+modest_tny_account_is_memory_card_account (TnyAccount *self);
 
 G_END_DECLS