Re: [evolution-patches] Re: Please review my patch for bug #46026

[Antonio Xu <antonio xu sun com>]

Thanks for you review my patch, Can you help me checking my patch into 
both trunk and branch?

Thanks
Anto
Ettore Perazzoli wrote:

> Looks good.  Thanks!
>
> On Tue, 2003-07-15 at 09:50, Antonio Xu wrote:
>  
>
> > Hello All,
> >       Could you review my patch for bug #46026? My patch can solve this
> > problem, I add a callback function to handle "back" signal of finish 
> > page, This handle will judge import_page->running, then force page jump 
> > to timezone page or importer page.
> >
> >       Bug Summary: Incorrect behaviour in setup assistant
> >       Bug Link:http://bugzilla.ximian.com/show_bug.cgi?id=46026
> >
> > Thanks
> > Antonio Xu
> >
> >
> >
> >
> > ______________________________________________________________________
> > Index: shell/e-shell-startup-wizard.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
> > retrieving revision 1.41
> > diff -u -r1.41 e-shell-startup-wizard.c
> > --- shell/e-shell-startup-wizard.c	11 Mar 2003 22:25:47 -0000	1.41
> > +++ shell/e-shell-startup-wizard.c	15 Jul 2003 12:42:02 -0000
> > @@ -392,6 +392,19 @@
> > 	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 @@
> > 	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 @@
> > 	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);
> > Index: shell/ChangeLog
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
> > retrieving revision 1.1287
> > diff -u -r1.1287 ChangeLog
> > --- shell/ChangeLog	9 Jul 2003 19:54:25 -0000	1.1287
> > +++ shell/ChangeLog	15 Jul 2003 12:49:16 -0000
> > @@ -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-09  Ettore Perazzoli  <ettore ximian com>
> >
> > 	* e-shell-folder-commands.c (e_shell_command_rename_folder): Do
> >    
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches
>