[evolution] Crash on Startup wizard cancel

[Milan Crha <mcrha src gnome org>]

commit 5270b3042f2f5b3e122d7c2ac4f365109458dd19
Author: Milan Crha <mcrha redhat com>
Date:   Thu Aug 26 16:22:47 2010 +0200

    Crash on Startup wizard cancel
    
    As reported in Red Hat bugzilla in 626810

 modules/startup-wizard/evolution-startup-wizard.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 1b9cbcd..e1b8551 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -185,10 +185,15 @@ startup_wizard_config_abort (EConfig *config,
 		g_assert_not_reached ();
 	}
 
-	e_import_cancel (
-		extension->import,
-		extension->import_target,
-		extension->import_importer);
+	if (extension->import_importer) {
+		e_import_cancel (
+			extension->import,
+			extension->import_target,
+			extension->import_importer);
+	} else {
+		startup_wizard_terminate ();
+		g_assert_not_reached ();
+	}
 
 	extension->import_cancelled = TRUE;
 	e_config_target_changed (config, E_CONFIG_TARGET_CHANGED_STATE);