X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.h;h=50dc0b87e71b4b4859ec38517771fe4ea4c1484d;hp=2e5cbb3766608ab51a636bb6efa6214dd11dfd5b;hb=bb515e94c04fe931befaebe40d91fa3e9217b7d6;hpb=90b7d85fe6a7f3a46b14810fb9476982d021716d

diff --git a/src/modest-tny-account-store.h b/src/modest-tny-account-store.h
index 2e5cbb3..50dc0b8 100644
--- a/src/modest-tny-account-store.h
+++ b/src/modest-tny-account-store.h
@@ -77,6 +77,13 @@ struct _ModestTnyAccountStoreClass {
 				       gpointer user_data);
 };
 
+typedef enum {
+	MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+	MODEST_TNY_ACCOUNT_STORE_QUERY_NAME,
+	MODEST_TNY_ACCOUNT_STORE_QUERY_URL,
+} ModestTnyAccountStoreQueryType;
+
+
 /**
  * modest_tny_account_store_get_type:
  *
@@ -97,33 +104,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 +145,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
@@ -166,6 +174,15 @@ TnyAccount * modest_tny_account_store_get_local_folders_account (TnyAccountStore
  **/
 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
 
 #endif /* __MODEST_TNY_ACCOUNT_STORE_H__ */