X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.h;h=679c97d1c17d68c5167a5e7d5e1328a12594445f;hp=5edea626d05d40347e32b80e063ab25af60ebda4;hb=22881be247b8a3e199c3d6275423d0c74a6a0981;hpb=d8ac0c31f8a4e72a97c6e8676bd6db188f631b73

diff --git a/src/modest-account-mgr.h b/src/modest-account-mgr.h
index 5edea62..679c97d 100644
--- a/src/modest-account-mgr.h
+++ b/src/modest-account-mgr.h
@@ -33,8 +33,7 @@
 
 #include <glib-object.h>
 #include <modest-conf.h>
-#include <modest-defs.h>
-#include <modest-protocol-info.h>
+#include <modest-protocol-registry.h>
 #include <modest-account-settings.h>
 
 G_BEGIN_DECLS
@@ -164,9 +163,9 @@ gboolean modest_account_mgr_add_server_account    (ModestAccountMgr *self,
 						   const guint portnumber,
 						   const gchar *username,
 						   const gchar *password,
-						   ModestTransportStoreProtocol proto,
-						   ModestConnectionProtocol security,
-						   ModestAuthProtocol auth);
+						   ModestProtocolType proto,
+						   ModestProtocolType security,
+						   ModestProtocolType auth);
 
 
 /**
@@ -182,7 +181,7 @@ gboolean modest_account_mgr_add_server_account    (ModestAccountMgr *self,
  */
 gboolean modest_account_mgr_add_server_account_uri    (ModestAccountMgr *self,
 						       const gchar *name,
-						       ModestTransportStoreProtocol proto,
+						       ModestProtocolType proto,
 						       const gchar* uri);
 
 /**
@@ -202,6 +201,18 @@ gboolean        modest_account_mgr_remove_account         (ModestAccountMgr *sel
 							   const gchar* name);
 
 /**
+ * modest_account_mgr_remove_account:
+ * @self: a ModestAccountMgr instance
+ * @name: the name of the server account to remove
+ * 
+ * remove an existing server account. This is only for internal use.
+ *
+ * Returns: TRUE if the operation succeeded, FALSE otherwise,
+ */
+gboolean        modest_account_mgr_remove_server_account         (ModestAccountMgr *self,
+								  const gchar* name);
+
+/**
  * modest_account_mgr_account_names:
  * @self: a ModestAccountMgr instance
  * @only_enabled: Whether only enabled accounts should be returned.
@@ -359,7 +370,11 @@ void  modest_account_mgr_set_display_name (ModestAccountMgr *self,
 					   const gchar *account_name,
 					   const gchar *display_name);
 
+gboolean modest_account_mgr_singleton_protocol_exists (ModestAccountMgr *mgr,
+						       ModestProtocolType protocol_type);
 
+gchar * modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
+				       const gchar *key, gboolean server_account);
 G_END_DECLS
 
 #endif /* __MODEST_ACCOUNT_MGR_H__ */