From 584f138975d2daf3e60b2f01808da3ae32986fa0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 13 Jun 2008 00:52:55 +0000 Subject: [PATCH] make the preference file keys more consistent. --- gtk/conf.c | 5 ++++- gtk/tr-prefs.h | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk/conf.c b/gtk/conf.c index 93641fcbd..5bd0e6ac4 100644 --- a/gtk/conf.c +++ b/gtk/conf.c @@ -355,9 +355,12 @@ translate_keyfile_to_json( const char * old_file, const char * new_file ) const char* newkey; } renamed[] = { { "default-download-directory", "download-dir" }, + { "encrypted-connections-only", "encryption" }, { "listening-port", "peer-port" }, { "nat-traversal-enabled", "port-forwarding-enabled" }, - { "encrypted-connections-only", "encryption" } + { "open-dialog-folder", "open-dialog-dir" }, + { "watch-folder", "watch-dir" }, + { "watch-folder-enabled", "watch-dir-enabled" } }; keyfile = g_key_file_new( ); diff --git a/gtk/tr-prefs.h b/gtk/tr-prefs.h index e480ed013..da1b2127f 100644 --- a/gtk/tr-prefs.h +++ b/gtk/tr-prefs.h @@ -26,10 +26,10 @@ GtkWidget * tr_prefs_dialog_new( GObject * core, GtkWindow * parent ); #define PREF_KEY_UL_LIMIT "upload-limit" #define PREF_KEY_OPTIONS_PROMPT "show-options-window" #define PREF_KEY_DOWNLOAD_DIR "download-dir" -#define PREF_KEY_OPEN_DIALOG_FOLDER "open-dialog-folder" +#define PREF_KEY_OPEN_DIALOG_FOLDER "open-dialog-dir" #define PREF_KEY_ALLOW_HIBERNATION "allow-hibernation" -#define PREF_KEY_DIR_WATCH "watch-folder" -#define PREF_KEY_DIR_WATCH_ENABLED "watch-folder-enabled" +#define PREF_KEY_DIR_WATCH "watch-dir" +#define PREF_KEY_DIR_WATCH_ENABLED "watch-dir-enabled" #define PREF_KEY_SHOW_TRAY_ICON "show-tray-icon" #define PREF_KEY_START "start-added-torrents" #define PREF_KEY_TRASH_ORIGINAL "trash-original-torrent-files" -- 2.40.0