X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-protocol.c;h=203edfc21dff31f513a8ab2c6f06451564c35585;hp=066fe09b281371dac84b17632dd0a98830182e19;hb=8f2f2684b452fbee0b5673cd31c7f7404804eef6;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c index 066fe09..203edfc 100644 --- a/src/modest-account-protocol.c +++ b/src/modest-account-protocol.c @@ -47,6 +47,8 @@ struct _ModestAccountProtocolPrivate { TnyList *account_options; GHashTable *custom_auth_mechs; GType account_g_type; + + GHashTable *account_dialogs; }; /* 'private'/'protected' functions */ @@ -80,6 +82,24 @@ static void modest_account_protocol_save_wizard_settings_default (ModestAccountP GList *wizard_pages, ModestAccountSettings *settings); +static ModestWizardDialogResponseOverrideFunc +modest_account_protocol_get_wizard_response_override_default (ModestAccountProtocol *self); + +static void modest_account_protocol_check_support_default (ModestAccountProtocol *self, + ModestAccountProtocolCheckSupportFunc func, + gpointer userdata); +static gboolean modest_account_protocol_is_supported_default (ModestAccountProtocol *self); +static gchar *modest_account_protocol_get_from_default (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox); +static ModestPairList *modest_account_protocol_get_from_list_default (ModestAccountProtocol *self, + const gchar *account_id); +static gchar *modest_account_protocol_get_signature_default (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox, + gboolean *has_signature); + + /* globals */ static GObjectClass *parent_class = NULL; @@ -160,6 +180,18 @@ modest_account_protocol_class_init (ModestAccountProtocolClass *klass) modest_account_protocol_save_wizard_settings_default; account_class->create_account = modest_account_protocol_create_account_default; + account_class->get_wizard_response_override = + modest_account_protocol_get_wizard_response_override_default; + account_class->is_supported = + modest_account_protocol_is_supported_default; + account_class->check_support = + modest_account_protocol_check_support_default; + account_class->get_from = + modest_account_protocol_get_from_default; + account_class->get_from_list = + modest_account_protocol_get_from_list_default; + account_class->get_signature = + modest_account_protocol_get_signature_default; } static void @@ -174,6 +206,30 @@ modest_account_protocol_instance_init (ModestAccountProtocol *obj) priv->account_g_type = 0; priv->account_options = tny_simple_list_new (); priv->custom_auth_mechs = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); + + priv->account_dialogs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); +} + +static gboolean +remove_account (const gchar *account_name, GObject *account, GObject *account_to_remove) +{ + return (account == account_to_remove); +} + +static void +account_dialog_weak_handler (ModestAccountProtocol *self, GObject *where_the_object_was) +{ + ModestAccountProtocolPrivate *priv = MODEST_ACCOUNT_PROTOCOL_GET_PRIVATE (self); + + g_hash_table_foreach_remove (priv->account_dialogs, (GHRFunc) remove_account, where_the_object_was); +} + +static gboolean +dialogs_remove (const gchar *account_name, GObject *account_dialog, ModestAccountProtocol *self) +{ + g_object_weak_unref (account_dialog, (GWeakNotify) account_dialog_weak_handler, self); + + return TRUE; } static void @@ -182,6 +238,11 @@ modest_account_protocol_finalize (GObject *obj) ModestAccountProtocol *protocol = MODEST_ACCOUNT_PROTOCOL (obj); ModestAccountProtocolPrivate *priv = MODEST_ACCOUNT_PROTOCOL_GET_PRIVATE (protocol); + if (priv->account_dialogs) { + g_hash_table_foreach_remove (priv->account_dialogs, (GHRFunc) dialogs_remove, obj); + g_hash_table_destroy (priv->account_dialogs); + } + if (priv->account_options) g_object_unref (priv->account_options); priv->account_options = NULL; @@ -337,6 +398,7 @@ modest_account_protocol_set_account_options (ModestAccountProtocol *self, priv = MODEST_ACCOUNT_PROTOCOL_GET_PRIVATE (self); if (priv->account_options) { + g_object_unref (priv->account_options); priv->account_options = NULL; } priv->account_options = tny_list_copy (list); @@ -434,33 +496,29 @@ modest_account_protocol_get_account_settings_dialog (ModestAccountProtocol *self { ModestAccountSettingsDialog *dialog; ModestAccountSettings *settings; + ModestAccountProtocolPrivate *priv; - dialog = MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->create_account_settings_dialog (self); - - /* Load settings */ - settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (), - account_name); - modest_account_settings_dialog_load_settings (dialog, settings); - - /* TODO: Those methods should be removed from the - interface and moved to specific implementations */ -/* modest_account_settings_dialog_switch_to_user_info (dialog); */ -/* modest_account_settings_dialog_check_allow_changes (dialog); */ - - /* Set modal */ - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + priv = MODEST_ACCOUNT_PROTOCOL_GET_PRIVATE (self); + dialog = g_hash_table_lookup (priv->account_dialogs, account_name); + + if (dialog == NULL) { + + dialog = MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->create_account_settings_dialog (self); - /* TODO: review this. When the dialog is closed, reconnect */ - /* g_signal_connect (dialog, "response", */ - /* G_CALLBACK (on_account_settings_dialog_response), */ - /* self); */ + /* Load settings */ + settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (), + account_name); + modest_account_settings_dialog_load_settings (dialog, settings); - /* Close dialog on response */ - g_signal_connect_swapped (dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + /* Close dialog on response */ + g_signal_connect_swapped (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + dialog); + + g_hash_table_insert (priv->account_dialogs, g_strdup (account_name), dialog); + g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) account_dialog_weak_handler, self); + } return dialog; } @@ -525,3 +583,103 @@ modest_account_protocol_save_wizard_settings_default (ModestAccountProtocol *sel g_warning ("You must implement save_wizard_settings"); } + +static ModestWizardDialogResponseOverrideFunc +modest_account_protocol_get_wizard_response_override_default (ModestAccountProtocol *self) +{ + g_return_val_if_fail (MODEST_IS_ACCOUNT_PROTOCOL (self), NULL); + + return NULL; +} + +ModestWizardDialogResponseOverrideFunc +modest_account_protocol_get_wizard_response_override (ModestAccountProtocol *self) +{ + g_return_val_if_fail (MODEST_IS_ACCOUNT_PROTOCOL (self), NULL); + + return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_wizard_response_override (self); +} + +static gboolean +modest_account_protocol_is_supported_default (ModestAccountProtocol *self) +{ + return TRUE; +} + +gboolean +modest_account_protocol_is_supported (ModestAccountProtocol *self) +{ + return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->is_supported (self); +} + +static void +modest_account_protocol_check_support_default (ModestAccountProtocol *self, + ModestAccountProtocolCheckSupportFunc func, + gpointer userdata) +{ + if (func) + func (self, TRUE, userdata); +} + +void +modest_account_protocol_check_support (ModestAccountProtocol *self, + ModestAccountProtocolCheckSupportFunc func, + gpointer userdata) +{ + MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->check_support (self, func, userdata); +} + +gchar * +modest_account_protocol_get_from (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox) +{ + return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_from (self, account_id, mailbox); +} +static gchar * +modest_account_protocol_get_from_default (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox) +{ + g_return_val_if_fail (MODEST_ACCOUNT_PROTOCOL (self), NULL); + + return NULL; +} + +ModestPairList * +modest_account_protocol_get_from_list (ModestAccountProtocol *self, + const gchar *account_id) +{ + return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_from_list (self, account_id); +} +static ModestPairList * +modest_account_protocol_get_from_list_default (ModestAccountProtocol *self, + const gchar *account_id) +{ + g_return_val_if_fail (MODEST_ACCOUNT_PROTOCOL (self), NULL); + + return NULL; +} + +gchar * +modest_account_protocol_get_signature (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox, + gboolean *has_signature) +{ + return MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->get_signature (self, account_id, mailbox, has_signature); +} + +static gchar * +modest_account_protocol_get_signature_default (ModestAccountProtocol *self, + const gchar *account_id, + const gchar *mailbox, + gboolean *has_signature) +{ + g_return_val_if_fail (MODEST_ACCOUNT_PROTOCOL (self), NULL); + if (has_signature) + *has_signature = FALSE; + + return NULL; +} +