make the preference file keys more consistent.

diff --git a/gtk/conf.c b/gtk/conf.c
index 93641fcbd6dcc344593e66d095de5f6d65f86c68..5bd0e6ac4b46e233b9648b0783ac3d41da9488b3 100644 (file)
--- 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 e480ed013a3b25894c0ede21a6d24cf25e7ab8ea..da1b2127f87a03c0206346fc1ff93c680b99138c 100644 (file)
--- 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"