aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-10 19:46:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-10 21:58:40 +0800
commit5e16c7dc88686748aa7a79a8d3e97f58736b4dee (patch)
treec1098bc4e4036687b8a1b795b24ba52040d0b449 /src
parent0ad091ed52c2818870dbfc3d7cd1aed573f5099f (diff)
downloadgsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar.gz
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar.bz2
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar.lz
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar.xz
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.tar.zst
gsoc2013-empathy-5e16c7dc88686748aa7a79a8d3e97f58736b4dee.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-account-assistant.c11
1 files changed, 8 insertions, 3 deletions
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;