X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.h;h=81698a90d2f49501dc654304b37130fde7b1a02f;hp=65a8322bbe9f5bffd5ff0defa0a66b9837e6b47b;hb=c5a5b586adace0a0a65316ea89ecbf52e5b08430;hpb=7dd43ed0b3b827799299291a53300db93d9b2711 diff --git a/src/modest-account-mgr.h b/src/modest-account-mgr.h index 65a8322..81698a9 100644 --- a/src/modest-account-mgr.h +++ b/src/modest-account-mgr.h @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include G_BEGIN_DECLS @@ -49,7 +49,6 @@ G_BEGIN_DECLS typedef struct _ModestAccountMgr ModestAccountMgr; typedef struct _ModestAccountMgrClass ModestAccountMgrClass; - struct _ModestAccountMgr { GObject parent; }; @@ -57,11 +56,33 @@ struct _ModestAccountMgr { struct _ModestAccountMgrClass { GObjectClass parent_class; - void (* account_removed) (ModestAccountMgr *obj, const gchar* account, - gboolean server_account, gpointer user_data); - void (* account_changed) (ModestAccountMgr *obj, const gchar* account, - const gchar* key, gboolean server_account, + void (* account_inserted) (ModestAccountMgr *obj, + const gchar* account, + gpointer user_data); + + void (* account_removed) (ModestAccountMgr *obj, + const gchar* account, gpointer user_data); + + void (* account_changed) (ModestAccountMgr *obj, + const gchar* account, + gpointer user_data); + + void (* account_busy_changed) (ModestAccountMgr *obj, + const gchar* account, + gboolean busy, + gpointer user_data); + + void (* default_account_changed)(ModestAccountMgr *obj, + gpointer user_data); + + void (* display_name_changed) (ModestAccountMgr *obj, + const gchar *account, + gpointer user_data); + + void (* account_updated) (ModestAccountMgr *obj, + const gchar *account, + gpointer user_data); }; /** @@ -85,6 +106,18 @@ ModestAccountMgr* modest_account_mgr_new (ModestConf *modest_c /** + * modest_account_mgr_add_account_from_settings: + * @self: a #ModestAccountMgr instance + * @self: a #ModestSettings + * + * Create a new account from a @settings instance. + * + * Returns: TRUE if the creation succeeded, FALSE otherwise, + */ +gboolean modest_account_mgr_add_account_from_settings (ModestAccountMgr *self, + ModestAccountSettings *settings); + +/** * modest_account_mgr_add_account: * @self: a ModestAccountMgr instance * @name: name (id) of the account, which is a valid UTF8 string that does not contain '/' @@ -98,7 +131,11 @@ ModestAccountMgr* modest_account_mgr_new (ModestConf *modest_c * Returns: TRUE if the creation succeeded, FALSE otherwise, */ gboolean modest_account_mgr_add_account (ModestAccountMgr *self, - const gchar* name, + const gchar *name, + const gchar *display_name, + const gchar *user_fullname, + const gchar *user_email, + ModestAccountRetrieveType retrieve_type, const gchar* store_name, const gchar* transport_name, gboolean enabled); @@ -108,6 +145,7 @@ gboolean modest_account_mgr_add_account (ModestAccountMgr *self, * @self: a ModestAccountMgr instance * @name: name (id) of the account, which is a valid UTF8 string that does not contain '/' * @hostname: the hostname + * @portnumber: the portnumber, or 0 for default * @username: the username * @password: the password * @proto: the protocol (imap, smtp, ...) used for this account @@ -122,11 +160,12 @@ gboolean modest_account_mgr_add_account (ModestAccountMgr *self, gboolean modest_account_mgr_add_server_account (ModestAccountMgr *self, const gchar *name, const gchar *hostname, + const guint portnumber, const gchar *username, const gchar *password, - ModestProtocol proto, - ModestSecureConnection security, - ModestSecureAuthentication auth); + ModestProtocolType proto, + ModestProtocolType security, + ModestProtocolType auth); /** @@ -142,14 +181,13 @@ gboolean modest_account_mgr_add_server_account (ModestAccountMgr *self, */ gboolean modest_account_mgr_add_server_account_uri (ModestAccountMgr *self, const gchar *name, - ModestProtocol proto, + ModestProtocolType proto, const gchar* uri); /** * modest_account_mgr_remove_account: * @self: a ModestAccountMgr instance * @name: the name of the account to remove - * @server_account: TRUE if the account to remove is a server account * @err: a #GError ptr, or NULL to ignore. * * remove an existing account. the account with @name should already exist; note @@ -160,9 +198,19 @@ gboolean modest_account_mgr_add_server_account_uri (ModestAccountMgr *self, * @err gives details in case of error */ gboolean modest_account_mgr_remove_account (ModestAccountMgr *self, - const gchar* name, - gboolean server_account); + 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: @@ -174,30 +222,20 @@ gboolean modest_account_mgr_remove_account (ModestAccountMgr *sel * Returns: a newly allocated list of account names, or NULL in case of error or * if there are no accounts. The caller must free the returned GSList. * - * TODO: I believe that the caller must free the strings in the GSList items too, - * because this is implemented via gconf_client_all_dirs() which also requires a deep free, - * though that's not documented. murrayc. */ GSList* modest_account_mgr_account_names (ModestAccountMgr *self, gboolean only_enabled); - /** - * modest_account_mgr_search_server_account: - * @self: a ModestAccountMgr instance - * @account_name: get only server accounts for @account_name, or NULL for any - * @type: get only server accounts from protocol type @type, or MODEST_PROTOCOL_TYPE_UNKNOWN - * @proto: get only server account with protocol @proto, or MODEST_PROTOCOL_UNKNOWN for any + * modest_account_mgr_free_account_names: + * @account_name: a gslist of account names * - * List all the server account names, optionally narrowing the result down to one account. + * list all account names * - * Returns: a newly allocated list of server account names, or NULL in case of - * error or if there are no server accounts. The caller must free the returned GSList + * free the list of account names */ -GSList* modest_account_mgr_search_server_accounts (ModestAccountMgr *self, - const gchar* account_name, - ModestProtocolType type, - ModestProtocol proto); +void modest_account_mgr_free_account_names (GSList *account_names); + /** * modest_account_mgr_account_exists: @@ -222,204 +260,118 @@ gboolean modest_account_mgr_account_exists (ModestAccountMgr *self, * * Returns: TRUE if the account with name @name exists, FALSE otherwise (or in case of error) */ -gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, - const gchar *display_name); - +gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, + const gchar *display_name); /** - * modest_account_mgr_get_string: - * @self: self a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to retrieve - * @server_account: if TRUE, this is a server account - * - * get a config string from an account + * modest_account_mgr_check_already_configured_account: + * @self: a #ModestAccountMgr + * @settings: a #ModestAccountSettings *settings * - * Returns: a newly allocated string with the value for the key, - * or NULL in case of error. - */ -gchar* modest_account_mgr_get_string (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - gboolean server_account); - - -/** - * modest_account_mgr_get_password: - * @self: self a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to retrieve - * @server_account: if TRUE, this is a server account - * - * get a password from an account + * Checks if there's already an active store account with the same settings * - * Returns: a newly allocated string with the value for the key, - * or NULL in case of error. + * Returns: %TRUE if account setup exists */ -gchar* modest_account_mgr_get_password (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - gboolean server_account); +gboolean modest_account_mgr_check_already_configured_account (ModestAccountMgr * self, + ModestAccountSettings *settings); /** - * modest_account_mgr_get_int: + * modest_account_mgr_unset: * @self: a ModestAccountMgr instance * @name: the name of the account - * @key: the key of the value to retrieve + * @key: the key of the value to unset * @server_account: if TRUE, this is a server account + * @err: a GError ptr, or NULL to ignore. * - * get a config int from an account + * unsets the config value of an account and all their children keys * - * Returns: an integer with the value for the key, or -1 in case of - * error (but of course -1 does not necessarily imply an error) + * Returns: TRUE if unsetting the value succeeded, or FALSE in case of error. + * @err gives details in case of error */ -gint modest_account_mgr_get_int (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - gboolean server_account); +gboolean modest_account_mgr_unset (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + gboolean server_account); /** - * modest_account_mgr_get_bool: + * modest_account_mgr_has_accounts: * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to retrieve - * @server_account: if TRUE, this is a server account + * @enabled: TRUE to search for enabled accounts only * - * get a config boolean from an account + * Checks if any accounts exist * - * Returns: an boolean with the value for the key, or FALSE in case of - * error (but of course FALSE does not necessarily imply an error) + * Returns: TRUE if accounts exist, FALSE otherwise */ -gboolean modest_account_mgr_get_bool (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - gboolean server_account); -/** - * modest_account_mgr_get_list: - * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to get - * @list_type: the type of the members of the list - * @server_account: if TRUE, this is a server account - * - * get a config list of values of type @list_type of an account - * - * Returns: a newly allocated list of elements - */ -GSList* modest_account_mgr_get_list (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - ModestConfValueType list_type, - gboolean server_account); +gboolean modest_account_mgr_has_accounts (ModestAccountMgr* self, gboolean enabled); /** - * modest_account_mgr_set_string: + * modest_account_mgr_set_account_busy * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to set - * @val: the value to set - * @server_account: if TRUE, this is a server account + * @account_name: name of the account + * @busy: whether to set busy or not busy * - * set a config string for an account. + * Changes the busy flag of an account * - * Returns: TRUE if setting the value succeeded, or FALSE in case of error. */ -gboolean modest_account_mgr_set_string (ModestAccountMgr *self, - const gchar *name, - const gchar *key, const gchar* val, - gboolean server_account); +void modest_account_mgr_set_account_busy(ModestAccountMgr* self, const gchar* account_name, + gboolean busy); /** - * modest_account_mgr_set_password: + * modest_account_mgr_account_is_busy * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to set - * @val: the value to set - * @server_account: if TRUE, this is a server account + * @account_name: name of the account * - * set a password for an account. + * Returns: If the account is currently busy or not * - * Returns: TRUE if setting the value succeeded, or FALSE in case of error. -* @err gives details in case of error */ -gboolean modest_account_mgr_set_password (ModestAccountMgr *self, - const gchar *name, - const gchar *key, const gchar* val, - gboolean server_account); +gboolean modest_account_mgr_account_is_busy (ModestAccountMgr* self, + const gchar* account_name); + + +void modest_account_mgr_notify_account_update (ModestAccountMgr* self, + const gchar *server_account_name); /** - * modest_account_mgr_set_int: + * modest_account_mgr_set_default_account: * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to set - * @val: the value to set - * @server_account: if TRUE, this is a server account + * @account: the name of an existing account * - * set a config int for an account + * set the default account name (which must be valid account) * - * Returns: TRUE if setting the value succeeded, or FALSE in case of error. + * Returns: TRUE if succeeded, FALSE otherwise */ -gboolean modest_account_mgr_set_int (ModestAccountMgr *self, - const gchar *name, - const gchar *key, gint val, - gboolean server_account); +gboolean modest_account_mgr_set_default_account (ModestAccountMgr *self, + const gchar* account); /** - * modest_account_mgr_set_bool: + * modest_account_mgr_get_default_account: * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to set - * @val: the value to set - * @server_account: if TRUE, this is a server account * - * set a config bool for an account + * get the default account name, or NULL if none is found * - * Returns: TRUE if setting the value succeeded, or FALSE in case of error. + * Returns: the default account name (as newly allocated string, which + * must be g_free'd), or NULL */ -gboolean modest_account_mgr_set_bool (ModestAccountMgr *self, - const gchar *name, - const gchar *key, gboolean val, - gboolean server_account); +gchar* modest_account_mgr_get_default_account (ModestAccountMgr *self); /** - * modest_account_mgr_set_list: + * modest_account_mgr_get_display_name: * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to set - * @val: the list with the values to set - * @list_type: the type of the members of the list - * @server_account: if TRUE, this is a server account + * @name: the account name to check * - * * set a config list of values of type @list_type of an account - * - * returns TRUE if this succeeded, FALSE otherwise + * Return the human-readable account title for this account, or NULL. */ -gboolean modest_account_mgr_set_list (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - GSList *val, - ModestConfValueType list_type, - gboolean server_account); +gchar* modest_account_mgr_get_display_name (ModestAccountMgr *self, + const gchar* name); -/** - * modest_account_mgr_unset: - * @self: a ModestAccountMgr instance - * @name: the name of the account - * @key: the key of the value to unset - * @server_account: if TRUE, this is a server account - * @err: a GError ptr, or NULL to ignore. - * - * unsets the config value of an account and all their children keys - * - * Returns: TRUE if unsetting the value succeeded, or FALSE in case of error. - * @err gives details in case of error - */ -gboolean modest_account_mgr_unset (ModestAccountMgr *self, - const gchar *name, - const gchar *key, - gboolean server_account); +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