aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorAntonio Xu <antonio.xu@sun.com>2003-07-21 14:41:52 +0800
committerAntonio Xu <anto@src.gnome.org>2003-07-21 14:41:52 +0800
commitb59ab9da29ff20517845195dbfb211f23e6da9c8 (patch)
tree4527d92beb0db58c51d2904134ce3ffa20d98394 /shell
parent0f8b35a3674c1494957a7af2f633b2558ab8fcd3 (diff)
downloadgsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar.gz
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar.bz2
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar.lz
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar.xz
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.tar.zst
gsoc2013-evolution-b59ab9da29ff20517845195dbfb211f23e6da9c8.zip
connect "back" signal to back_finish_func in finish page.
2003-07-21 Antonio Xu <antonio.xu@sun.com> * e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect "back" signal to back_finish_func in finish page. (back_finish_func): handle "back" signal. (prepare_importer_page): Jump to finish page when running equal zero. [#46026] svn path=/trunk/; revision=21875
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-startup-wizard.c16
2 files changed, 24 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d381bd3598..3cc3eed4ff 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-15 Antonio Xu <antonio.xu@sun.com>
+
+ * e-shell-startup-wizard.c (e_shell_startup_wizard_create): connect
+ "back" signal to back_finish_func in finish page.
+ (back_finish_func): handle "back" signal.
+ (prepare_importer_page): Jump to finish page when running equal zero.
+ [#46026]
+
2003-07-17 Dan Winship <danw@ximian.com>
* e-shell-user-creatable-items-handler.c (free_menu_items): free
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index b684044ac0..2ca03d7750 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -392,6 +392,19 @@ finish_func (GnomeDruidPage *page,
return TRUE;
}
+static gboolean
+back_finish_func (GnomeDruidPage *page,
+ GnomeDruid *druid,
+ SWData *data)
+{
+ if (data->import_page->running == 0)
+ gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->timezone_page->page));
+ else
+ return FALSE;
+
+ return TRUE;
+}
+
static void
connect_page (GtkWidget *page,
SWData *data)
@@ -528,6 +541,8 @@ prepare_importer_page (GnomeDruidPage *page,
int running = 0;
if (data->import_page->prepared == TRUE) {
+ if (data->import_page->running == 0)
+ gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish));
return TRUE;
}
@@ -776,6 +791,7 @@ e_shell_startup_wizard_create (void)
g_return_val_if_fail (data->start != NULL, FALSE);
g_return_val_if_fail (data->finish != NULL, FALSE);
g_signal_connect (data->finish, "finish", G_CALLBACK (finish_func), data);
+ g_signal_connect (data->finish, "back", G_CALLBACK (back_finish_func), data);
make_corba_dialog_pages (data);
g_return_val_if_fail (data->corba_wizard != CORBA_OBJECT_NIL, TRUE);