From 0cd70c5f256d6071c5fc9671b5094a37ea0faabe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Fri, 15 May 2009 11:06:15 +0200 Subject: [PATCH] Fixes NB#117008, show the proper wizard pages for plugin protocols --- src/hildon2/modest-easysetup-wizard-dialog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index f367376..7e8fb92 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -1606,22 +1606,22 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) gchar *proto_name; ModestProtocolType proto_type; + /* Get protocol data */ + proto_name = modest_provider_picker_get_active_provider_id (picker); + protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (), + MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS, + proto_name); + proto_type = modest_protocol_get_type_id (protocol); + /* If we come from a rollbacked easy setup */ - if (priv->last_plugin_protocol_selected == - MODEST_PROTOCOL_REGISTRY_TYPE_INVALID && + if (priv->last_plugin_protocol_selected != proto_type && priv->page_complete_easysetup) { remove_non_common_tabs (notebook, TRUE); init_user_page (priv); priv->page_complete_easysetup = NULL; } - proto_name = modest_provider_picker_get_active_provider_id (picker); - protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (), - MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS, - proto_name); - proto_type = modest_protocol_get_type_id (protocol); - if (protocol && MODEST_IS_ACCOUNT_PROTOCOL (protocol) && proto_type != priv->last_plugin_protocol_selected) { ModestPairList *tabs; -- 1.7.9.5