[nautilus-actions] At end, quit the assistants on Cancel without warning

[Pierre Wieser <pwieser src gnome org>]

commit 964f45c767e424e98a6df95e3b0ca5b3d73ca988
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Oct 17 18:49:24 2009 +0200

    At end, quit the assistants on Cancel without warning

 ChangeLog                        |    4 ++++
 src/nact/nact-assistant-export.c |    1 +
 src/nact/nact-assistant-import.c |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1689344..7e3fa8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-17 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nact-assistant-export.c (assist_prepare_exportdone):
+	* src/nact/nact-assistant-import.c (prepare_importdone):
+	At end, quit the assistant on Cancel without warning.
+
 	* src/nact/base-window.c (setup_builder):
 	A window may have its own builder, or its own UI XML definition file,
 	or both.
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 57a7b6f..930d6a5 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -911,6 +911,7 @@ assist_prepare_exportdone( NactAssistantExport *window, GtkAssistant *assistant,
 
 	gtk_assistant_set_page_complete( assistant, page, TRUE );
 	base_assistant_set_warn_on_cancel( BASE_ASSISTANT( window ), FALSE );
+	base_assistant_set_warn_on_esc( BASE_ASSISTANT( window ), FALSE );
 }
 
 #ifdef NA_MAINTAINER_MODE
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 28800f7..70ee11c 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -758,6 +758,7 @@ prepare_importdone( NactAssistantImport *window, GtkAssistant *assistant, GtkWid
 
 	gtk_assistant_set_page_complete( assistant, page, TRUE );
 	base_assistant_set_warn_on_cancel( BASE_ASSISTANT( window ), FALSE );
+	base_assistant_set_warn_on_esc( BASE_ASSISTANT( window ), FALSE );
 }
 
 static void