[totem/gsettings: 16/20] Change "*-path" keys to "*-uri"

[Philip Withnall <pwithnall src gnome org>]

commit 6f4d486aee7f2a4c66e96754bef6876315110117
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Aug 18 09:24:34 2010 +0100

    Change "*-path" keys to "*-uri"
    
    They store URIs, not paths.

 data/org.gnome.totem.gschema.xml.in.in           |    4 ++--
 data/totem.convert                               |    4 ++--
 src/plugins/screenshot/totem-screenshot-plugin.c |    4 ++--
 src/totem-uri.c                                  |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/org.gnome.totem.gschema.xml.in.in b/data/org.gnome.totem.gschema.xml.in.in
index e7c8918..160efd4 100644
--- a/data/org.gnome.totem.gschema.xml.in.in
+++ b/data/org.gnome.totem.gschema.xml.in.in
@@ -86,12 +86,12 @@
 			<_summary>Subtitle encoding</_summary>
 			<_description>Encoding character set for subtitle.</_description>
 		</key>
-		<key name="open-path" type="s">
+		<key name="open-uri" type="s">
 			<default>''</default>
 			<_summary>Default location for the "Open..." dialogs</_summary>
 			<_description>Default location for the "Open..." dialogs. Default is the current directory.</_description>
 		</key>
-		<key name="screenshot-save-path" type="s">
+		<key name="screenshot-save-uri" type="s">
 			<default>''</default>
 			<_summary>Default location for the "Take Screenshot" dialogs</_summary>
 			<_description>Default location for the "Take Screenshot" dialogs. Default is the Pictures directory.</_description>
diff --git a/data/totem.convert b/data/totem.convert
index b422301..18e063c 100644
--- a/data/totem.convert
+++ b/data/totem.convert
@@ -17,8 +17,8 @@ visual-quality = /apps/totem/visual_quality
 network-buffer-threshold = /apps/totem/network-buffer-threshold
 subtitle-font = /apps/totem/subtitle_font
 subtitle-encoding = /apps/totem/subtitle_encoding
-open-path = /apps/totem/open_path
-screenshot-save-path = /apps/totem/screenshot_save_path
+open-uri = /apps/totem/open_path
+screenshot-save-uri = /apps/totem/screenshot_save_path
 disable-user-plugins = /apps/totem/disable_user_plugins
 disable-keyboard-shortcuts = /apps/totem/disable_keyboard_shortcuts
 autoload-subtitles = /apps/totem/autoload_subtitles
diff --git a/src/plugins/screenshot/totem-screenshot-plugin.c b/src/plugins/screenshot/totem-screenshot-plugin.c
index e8d0d04..a8aa3d6 100644
--- a/src/plugins/screenshot/totem-screenshot-plugin.c
+++ b/src/plugins/screenshot/totem-screenshot-plugin.c
@@ -319,7 +319,7 @@ totem_screenshot_plugin_setup_file_chooser (const char *filename_format, const c
 
 	/* Set the default path */
 	settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
-	path = g_settings_get_string (settings, "screenshot-save-path");
+	path = g_settings_get_string (settings, "screenshot-save-uri");
 	g_object_unref (settings);
 
 	/* Default to the Pictures directory */
@@ -361,7 +361,7 @@ totem_screenshot_plugin_update_file_chooser (const char *uri)
 	g_object_unref (parent);
 
 	settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
-	g_settings_set_string (settings, "screenshot-save-path", dir);
+	g_settings_set_string (settings, "screenshot-save-uri", dir);
 	g_object_unref (settings);
 	g_free (dir);
 }
diff --git a/src/totem-uri.c b/src/totem-uri.c
index 41e294a..3662411 100644
--- a/src/totem-uri.c
+++ b/src/totem-uri.c
@@ -608,7 +608,7 @@ totem_add_subtitle (GtkWindow *parent, const char *uri)
 	g_free (new_path);
 
 	/* Add the last open path as a shortcut */
-	new_path = g_settings_get_string (settings, "open-path");
+	new_path = g_settings_get_string (settings, "open-uri");
 	if (new_path != NULL && *new_path != '\0') {
 		gtk_file_chooser_add_shortcut_folder_uri (GTK_FILE_CHOOSER (fs), new_path, NULL);
 	}
@@ -669,7 +669,7 @@ totem_add_files (GtkWindow *parent, const char *path)
 		set_folder = gtk_file_chooser_set_current_folder_uri
 			(GTK_FILE_CHOOSER (fs), path);
 	} else {
-		new_path = g_settings_get_string (settings, "open-path");
+		new_path = g_settings_get_string (settings, "open-uri");
 		if (new_path != NULL && *new_path != '\0') {
 			set_folder = gtk_file_chooser_set_current_folder_uri
 				(GTK_FILE_CHOOSER (fs), new_path);
@@ -703,7 +703,7 @@ totem_add_files (GtkWindow *parent, const char *path)
 	mrl = filenames->data;
 	if (mrl != NULL) {
 		new_path = g_path_get_dirname (mrl);
-		g_settings_set_string (settings, "open-path", new_path);
+		g_settings_set_string (settings, "open-uri", new_path);
 		g_free (new_path);
 	}