Commit 3985fe54 authored by Philip Withnall's avatar Philip Withnall

Change "*-path" keys to "*-uri"

They store URIs, not paths.
parent 5b3e8745
......@@ -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>
......
......@@ -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
......
......@@ -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);
}
......
......@@ -610,7 +610,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);
}
......@@ -671,7 +671,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);
......@@ -705,7 +705,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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment