aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-22 18:58:45 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-25 22:13:40 +0800
commitf1cca624fa83a3a1fe33a227edd4b8c6f0e0978c (patch)
tree8b14edee9d117fffed55ed7f0a7ae5c605903688 /src
parentcc1003c0f40aa8165194c0412a63da672ce0e869 (diff)
downloadgsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar.gz
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar.bz2
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar.lz
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar.xz
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.tar.zst
gsoc2013-empathy-f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c.zip
Don't display the salut page after the import one if there is no need to
Diffstat (limited to 'src')
-rw-r--r--src/empathy-account-assistant.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 565da707b..f341fa5d0 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -89,6 +89,7 @@ typedef struct {
/* import page */
EmpathyImportWidget *iw;
+ GtkWidget *import_page;
/* salut page */
GtkWidget *salut_page;
@@ -512,7 +513,11 @@ account_assistant_page_forward_func (gint current_page,
}
else if (current_page == PAGE_IMPORT)
{
- retval = PAGE_SALUT;
+ if (priv->display_salut_page)
+ retval = PAGE_SALUT;
+ else
+ /* Don't go forward */
+ retval = -1;
}
else if (current_page >= PAGE_ENTER_CREATE)
{
@@ -1101,6 +1106,9 @@ account_mgr_prepare_cb (GObject *source_object,
priv->display_salut_page = FALSE;
update_intro_page_buttons (self);
+
+ gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->import_page,
+ GTK_ASSISTANT_PAGE_CONFIRM);
}
}
@@ -1157,6 +1165,7 @@ do_constructed (GObject *object)
_("Import your existing accounts"));
gtk_assistant_set_page_complete (assistant, page, TRUE);
gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_INTRO);
+ priv->import_page = page;
/* third page (enter account details) */
page = account_assistant_build_enter_or_create_page (self);