[nautilus-actions] Check status of imported actions

[Pierre Wieser <pwieser src gnome org>]

commit 271a6b78e9844c3b9c4e7f8b90e24fb9a8641919
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Oct 15 19:17:40 2009 +0200

    Check status of imported actions
    
    Fix NoImport on Cancel

 ChangeLog                            |    1 +
 src/nact/nact-assistant-import-ask.c |    3 +--
 src/nact/nact-assistant-import.c     |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3cca5bb..7d1c6ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
 	the preference name as an argument.
 	Define IPREFS_IMPORT_ASK_LAST_MODE, IPREFS_IMPORT_ASK_KEEP_MODE
 	new preferences.
+	Check status of imported actions.
 
 	* src/nact/nact-main-window.c
 	(nact_main_window_action_exists): Renamed as
diff --git a/src/nact/nact-assistant-import-ask.c b/src/nact/nact-assistant-import-ask.c
index 2fb0475..d5b50bc 100644
--- a/src/nact/nact-assistant-import-ask.c
+++ b/src/nact/nact-assistant-import-ask.c
@@ -405,8 +405,6 @@ on_cancel_clicked( GtkButton *button, NactAssistantImportAsk *editor )
 {
 	GtkWindow *toplevel = base_window_get_toplevel( BASE_WINDOW( editor ));
 
-	editor->private->mode = IPREFS_IMPORT_NO_IMPORT;
-
 	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
 
@@ -457,6 +455,7 @@ base_dialog_response( GtkDialog *dialog, gint code, BaseWindow *window )
 		case GTK_RESPONSE_CLOSE:
 		case GTK_RESPONSE_CANCEL:
 
+			editor->private->mode = IPREFS_IMPORT_NO_IMPORT;
 			return( TRUE );
 			break;
 
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 230f8fd..c82f4d9 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -680,6 +680,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
 		window->private->results = g_slist_prepend( window->private->results, str );
 
 		if( action ){
+			na_object_check_status( action );
 			items = g_list_prepend( NULL, action );
 			nact_iactions_list_insert_items( NACT_IACTIONS_LIST( mainwnd ), items, NULL );
 			na_object_free_items_list( items );