From 5e16c7dc88686748aa7a79a8d3e97f58736b4dee Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 10 Feb 2010 11:46:11 +0000 Subject: Fix creation of imported accounts (#609439) impl_signal_apply isn't called any more after the "import" page as this page as a 'next' button now. So we have to create the imported accounts when preparing the next page. --- src/empathy-account-assistant.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index a7a142cb0..58ff1aa2c 100644 --- a/src/empathy-account-assistant.c +++ b/src/empathy-account-assistant.c @@ -874,9 +874,6 @@ impl_signal_apply (GtkAssistant *assistant) account_assistant_apply_account_and_finish (self, priv->salut_settings); return; } - - else if (current_page == PAGE_IMPORT) - empathy_import_widget_add_selected_accounts (priv->iw); } static void @@ -893,6 +890,14 @@ impl_signal_prepare (GtkAssistant *assistant, EmpathyAccountAssistantPriv *priv = GET_PRIV (self); gint current_idx; + /* check from which page we are coming from */ + switch (priv->current_page_id) + { + case PAGE_IMPORT: + empathy_import_widget_add_selected_accounts (priv->iw); + break; + } + current_idx = gtk_assistant_get_current_page (assistant); priv->current_page_id = current_idx; -- cgit v1.2.3