Fix some unit tests.

[modest] / src / modest-account-mgr.h

diff --git a/src/modest-account-mgr.h b/src/modest-account-mgr.h
index 5edea62..81698a9 100644 (file)
--- 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,6 +370,8 @@ 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);
 
 G_END_DECLS