[nautilus-actions] 'folder-last-path' preference key is renamed as 'folder-last-folder-uri'

[Pierre Wieser <pwieser src gnome org>]

commit 375eaa0fbf61a676adef8240455e192589d587f7
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 12 23:02:23 2011 +0100

    'folder-last-path' preference key is renamed as 'folder-last-folder-uri'
    
    + src/nact/nact-ifolders-tab.c is updated accordingly.

 ChangeLog                    |    7 +++++++
 README-GCONF                 |    2 +-
 src/core/na-settings.c       |    2 +-
 src/nact/nact-ifolders-tab.c |   28 +++++++++++++++-------------
 src/utils/na-gconf2key.sh.in |    2 +-
 5 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b564d91..4db8dca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,13 @@
 
 	* README-GCONF:
 	* src/core/na-settings.c:
+	* src/utils/na-gconf2key.sh.in:
+	'folder-last-path' key is renamed as 'folder-last-folder-uri'.
+
+	* src/nact/nact-ifolders-tab.c: Updated accordingly.
+
+	* README-GCONF:
+	* src/core/na-settings.c:
 	* src/utils/na-gconf2key.sh.in: Add 'export-ask-user-wsp' preference.
 
 	* src/nact/nact-add-capability-dialog.c (base_get_iprefs_window_id):
diff --git a/README-GCONF b/README-GCONF
index 567b6af..1454b3d 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -86,7 +86,7 @@ Deprecating GConf
  ienvironment-try-exec-dialog = [327,70,..  [nact]     environment-try-exec-wsp
  ienvironment-try-exec-uri = file:///bin    [nact]     environment-try-exec-last-folder-uri
  ifolders-chooser = [418,86,632,573]        [nact]     folder-chooser-wsp
- ifolders-path = /home/pierre/data/Pictures [nact]     folder-last-path
+ ifolders-path = /home/pierre/data/Pictures [nact]     folder-last-folder-uri
  import-ask-user                            [nact]     import-ask-user-wsp
  import-ask-user-last-mode                  [nact]     import-ask-user-last-mode
  import-assistant                           [nact]     import-assistant-wsp
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index 86711ab..8452a73 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -136,7 +136,7 @@ static const KeyDef st_def_keys[] = {
 	{ "export-last-folder-uri",                      GROUP_NACT,        NA_BOXED_TYPE_STRING,      "" },
 	{ "export-preferred-format",                     GROUP_NACT,        NA_BOXED_TYPE_STRING,      "Desktop1" },
 	{ "folder-chooser-wsp",                          GROUP_NACT,        NA_BOXED_TYPE_UINT_LIST,   "" },
-	{ "folder-last-path",                            GROUP_NACT,        NA_BOXED_TYPE_STRING,      "" },
+	{ "folder-last-folder-uri",                      GROUP_NACT,        NA_BOXED_TYPE_STRING,      "" },
 	{ "import-ask-user-wsp",                         GROUP_NACT,        NA_BOXED_TYPE_UINT_LIST,   "" },
 	{ "import-ask-user-last-mode",                   GROUP_NACT,        NA_BOXED_TYPE_STRING,      "" },
 	{ "import-assistant-wsp",                        GROUP_NACT,        NA_BOXED_TYPE_UINT_LIST,   "" },
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index 0daa9f3..df4bf3d 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -57,8 +57,8 @@ struct NactIFoldersTabInterfacePrivate {
 
 #define ITAB_NAME						"folders"
 
-#define IPREFS_FOLDERS_DIALOG			"ifolders-chooser"
-#define IPREFS_FOLDERS_PATH				"ifolders-path"
+#define IPREFS_FOLDERS_WSP				"folder-chooser-wsp"
+#define IPREFS_FOLDERS_URI				"folder-last-folder-uri"
 
 static gboolean st_initialized = FALSE;
 static gboolean st_finalized = FALSE;
@@ -270,13 +270,13 @@ on_browse_folder_clicked( GtkButton *button, BaseWindow *window )
 	gtk_widget_destroy( dialog );
 #endif
 
-	gchar *path;
+	gchar *uri, *path;
 	GtkWindow *toplevel;
 	GtkWidget *dialog;
 	NactApplication *application;
 	NAUpdater *updater;
 
-	path = NULL;
+	uri = NULL;
 	toplevel = base_window_get_toplevel( window );
 
 	/* i18n: title of the FileChoose dialog when selecting an URI which
@@ -292,24 +292,26 @@ on_browse_folder_clicked( GtkButton *button, BaseWindow *window )
 	application = NACT_APPLICATION( base_window_get_application( window ));
 	updater = nact_application_get_updater( application );
 
-	base_iprefs_position_named_window( window, GTK_WINDOW( dialog ), IPREFS_FOLDERS_DIALOG );
+	base_iprefs_position_named_window( window, GTK_WINDOW( dialog ), IPREFS_FOLDERS_WSP );
 
-	path = na_iprefs_read_string( NA_IPREFS( updater ), IPREFS_FOLDERS_PATH, "/" );
-	if( path && g_utf8_strlen( path, -1 )){
-		gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( dialog ), path );
+	uri = na_iprefs_read_string( NA_IPREFS( updater ), IPREFS_FOLDERS_URI, "file:///" );
+	if( uri && g_utf8_strlen( uri, -1 )){
+		gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( dialog ), uri );
 	}
-	g_free( path );
+	g_free( uri );
 
 	if( gtk_dialog_run( GTK_DIALOG( dialog )) == GTK_RESPONSE_ACCEPT ){
-		path = gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER( dialog ));
-		nact_iprefs_write_string( window, IPREFS_FOLDERS_PATH, path );
+		uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
+		nact_iprefs_write_string( window, IPREFS_FOLDERS_URI, uri );
 
+		path = g_filename_from_uri( uri, NULL, NULL );
 		nact_match_list_insert_row( window, ITAB_NAME, path, FALSE, FALSE );
-
 		g_free( path );
+
+		g_free( uri );
 	}
 
-	base_iprefs_save_named_window_position( window, GTK_WINDOW( dialog ), IPREFS_FOLDERS_DIALOG );
+	base_iprefs_save_named_window_position( window, GTK_WINDOW( dialog ), IPREFS_FOLDERS_WSP );
 
 	gtk_widget_destroy( dialog );
 }
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index d66e845..f0d00c4 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -506,7 +506,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "folder-chooser-wsp" list "${value}"
 			;;
 		ifolders-path)
-			add_pref "nact" "folder-last-path" str "${value}"
+			add_pref "nact" "folder-last-folder-uri" str "file://${value}"
 			;;
 		import-ask-user)
 			add_pref "nact" "import-ask-user-wsp" list "${value}"