diff options
Diffstat (limited to 'mail/mail-config-druid.c')
| -rw-r--r-- | mail/mail-config-druid.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index a529b47220..c7e2f498f6 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -491,6 +491,7 @@ static const char *pages[] = { "transport_page", "management_page", "finish_page", + "druidpagestart1", NULL }; @@ -678,7 +679,7 @@ construct (MailConfigDruid *druid) g_signal_connect(page, "back", G_CALLBACK (back_func), druid); g_signal_connect(page, "finish", G_CALLBACK (finish_func), druid); - if (i != 5) { + if (i < 5) { Bonobo_Control control; GtkWidget *w; CORBA_Environment ev; @@ -695,8 +696,9 @@ construct (MailConfigDruid *druid) w = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL); gtk_box_pack_start (GTK_BOX (dpage->vbox), w, TRUE, TRUE, 0); - gtk_widget_show_all (w); } + gtk_widget_show_all (page); + } g_signal_connect(druid->druid, "cancel", G_CALLBACK(druid_cancel), druid); @@ -984,10 +986,8 @@ wizard_free (MailConfigWizard *wizard) g_free (wizard); } -static BonoboObject * -evolution_mail_config_wizard_factory_fn (BonoboGenericFactory *factory, - const char *id, - void *closure) +BonoboObject * +evolution_mail_config_wizard_new(void) { EvolutionWizard *wizard; MailConfigAccount *account; @@ -1017,19 +1017,3 @@ evolution_mail_config_wizard_factory_fn (BonoboGenericFactory *factory, return BONOBO_OBJECT (wizard); } - -void -evolution_mail_config_wizard_init (void) -{ - BonoboGenericFactory *factory; - - factory = bonobo_generic_factory_new (WIZARD_IID, - evolution_mail_config_wizard_factory_fn, NULL); - - if (factory == NULL) { - g_warning ("Error starting factory"); - return; - } - - bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); -} |