[nautilus-actions] Change import default mode and export default format to 'Ask'

[Pierre Wieser <pwieser src gnome org>]

commit f3bd5ac0017fa37414e9b8e1216d0cab431acf6a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Dec 9 13:18:48 2011 +0100

    Change import default mode and export default format to 'Ask'

 ChangeLog                  |    4 ++++
 src/core/na-importer-ask.c |    2 +-
 src/core/na-settings.h     |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d3dfe2..174f530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-09 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-importer-ask.c (na_importer_ask_user):
+	* src/core/na-settings.h:
+	Change import default mode and export default format to 'Ask'.
+
 	* src/io-xml/naxml-writer.c
 	(write_data_schema_v2, write_data_dump):
 	String and uint lists have the GConf format (between square brackets).
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index b84d8a3..216cb34 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -290,7 +290,7 @@ na_importer_ask_user( const NAObjectItem *importing, const NAObjectItem *existin
 	g_debug( "%s: importing=%p, existing=%p, parms=%p",
 			thisfn, ( void * ) importing, ( void * ) existing, ( void * ) parms );
 
-	mode = IMPORTER_MODE_NO_IMPORT;
+	mode = IMPORTER_MODE_ASK;
 	dialog = import_ask_new( parms->parent );
 
 	if( dialog ){
diff --git a/src/core/na-settings.h b/src/core/na-settings.h
index 18fbd69..5250a63 100644
--- a/src/core/na-settings.h
+++ b/src/core/na-settings.h
@@ -130,8 +130,8 @@ G_BEGIN_DECLS
 #define NA_IPREFS_IO_PROVIDER_READABLE				"readable"
 #define NA_IPREFS_IO_PROVIDER_WRITABLE				"writable"
 
-#define NA_IPREFS_DEFAULT_EXPORT_FORMAT				"Desktop1"
-#define NA_IPREFS_DEFAULT_IMPORT_MODE				"NoImport"
+#define NA_IPREFS_DEFAULT_EXPORT_FORMAT				"Ask"
+#define NA_IPREFS_DEFAULT_IMPORT_MODE				"Ask"
 #define NA_IPREFS_DEFAULT_LIST_ORDER_MODE			"AscendingOrder"
 
 /* pre-registration of a callback