[nautilus-actions] Icon chooser now only records last folder uri

[Pierre Wieser <pwieser src gnome org>]

commit 8aa16102e7c44b821de8cff9d6a4fcd78c14e2de
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 14 17:28:27 2011 +0100

    Icon chooser now only records last folder uri
    
    NASettings preference is renamed accordingly.

 ChangeLog                    |    5 +++++
 src/core/na-settings.h       |    2 +-
 src/nact/nact-icon-chooser.c |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c891302..2fc893e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,11 @@
 	* src/utils/nautilus-actions-run.c:
 	* src/utils/nautilus-actions-schemas.c: Add locale.h include.
 
+	* src/nact/nact-icon-chooser.c
+	(fillup_icons_by_path, on_path_selection_changed): Store last folder uri.
+
+	* src/core/na-settings.h: Preference renamed accordingly.
+
 	* README-GCONF:
 	* src/core/na-settings.h:
 	* src/utils/na-gconf2key.sh.in:
diff --git a/src/core/na-settings.h b/src/core/na-settings.h
index 2fc5855..47eb156 100644
--- a/src/core/na-settings.h
+++ b/src/core/na-settings.h
@@ -120,7 +120,7 @@ GType na_settings_get_type( void );
 #define NA_IPREFS_IMPORT_ASSISTANT_URI			"import-assistant-lfu"
 #define NA_IPREFS_IMPORT_MODE_KEEP_LAST_CHOICE	"import-mode-keep-last-choice"
 #define NA_IPREFS_IMPORT_PREFERRED_MODE			"import-preferred-mode"
-#define NA_IPREFS_ICON_CHOOSER_URI				"item-icon-chooser-last-file-uri"
+#define NA_IPREFS_ICON_CHOOSER_URI				"item-icon-chooser-lfu"
 #define NA_IPREFS_ICON_CHOOSER_PANED			"item-icon-chooser-paned-width"
 #define NA_IPREFS_ICON_CHOOSER_WSP				"item-icon-chooser-wsp"
 #define NA_IPREFS_IO_PROVIDERS_WRITE_ORDER		"io-providers-write-order"
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index 58024a1..9baf3c9 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -539,7 +539,7 @@ fillup_icons_by_path( NactIconChooser *editor )
 
 	uri = na_settings_get_string( settings, NA_IPREFS_ICON_CHOOSER_URI, NULL, NULL );
 	if( uri ){
-		gtk_file_chooser_set_uri( file_chooser, uri );
+		gtk_file_chooser_set_current_folder_uri( file_chooser, uri );
 		g_free( uri );
 	} else if( editor->private->current_icon ){
 		gtk_file_chooser_set_filename( file_chooser, editor->private->current_icon );
@@ -840,7 +840,7 @@ on_path_selection_changed( GtkFileChooser *file_chooser, NactIconChooser *editor
 	NAUpdater *updater;
 	NASettings *settings;
 
-	uri = gtk_file_chooser_get_uri( file_chooser );
+	uri = gtk_file_chooser_get_current_folder_uri( file_chooser );
 	if( uri ){
 		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( editor )));
 		updater = nact_application_get_updater( application );