[gnome-commander/GSettings] Adds backup_filter filter option to GSettings (now known as hide-backup-files)

[Uwe Scholz <uwescholz src gnome org>]

commit 6e1355acd0680fa03d73faebad7ecc97092578b5
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Thu May 19 21:38:49 2016 +0200

    Adds backup_filter filter option to GSettings (now known as hide-backup-files)

 data/org.gnome.gnome-commander.gschema.xml |    2 +-
 src/gnome-cmd-data.cc                      |   15 +++++++++++++--
 src/gnome-cmd-data.h                       |    1 +
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 6cc5113..ecfbc91 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -346,7 +346,7 @@
       <default>true</default>
       <summary>Hide files and folders starting with a dot</summary>
     </key>
-    <key name="backup-filter" type="b">
+    <key name="hide-backup-files" type="b">
       <default>true</default>
       <summary></summary>
       <description></description>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index c3533f5..4cec90e 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -159,6 +159,9 @@ void on_filter_changed ()
     filter = g_settings_get_boolean (gnome_cmd_data.options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_DOTFILE);
     gnome_cmd_data.options.filter.hidden = filter;
 
+    filter = g_settings_get_boolean (gnome_cmd_data.options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_BACKUP);
+    gnome_cmd_data.options.filter.backup = filter;
+
     main_win->update_view();
 }
 
@@ -248,6 +251,11 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
                       G_CALLBACK (on_filter_changed),
                       NULL);
 
+    g_signal_connect (gs->filter,
+                      "changed::hide-backup-files",
+                      G_CALLBACK (on_filter_changed),
+                      NULL);
+
 }
 
 
@@ -1622,6 +1630,9 @@ void GnomeCmdData::migrate_all_data_to_gsettings()
         //hidden_filter
         migrate_data_int_value_into_gsettings(gnome_cmd_data_get_bool ("/options/hidden_filter", FALSE) ? 1 
: 0,
                                                         options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_DOTFILE);
+        //hidden_filter
+        migrate_data_int_value_into_gsettings(gnome_cmd_data_get_bool ("/options/backup_filter", FALSE) ? 1 
: 0,
+                                                        options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_BACKUP);
         // ToDo: Move old xml-file to ~/.gnome-commander/gnome-commander.xml.backup
         //       à la save_devices_old ("devices.backup");
         //       and move .gnome2/gnome-commander to .gnome2/gnome-commander.backup
@@ -1748,7 +1759,7 @@ void GnomeCmdData::load()
     options.filter.file_types[GNOME_VFS_FILE_TYPE_BLOCK_DEVICE] = g_settings_get_boolean 
(options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_BLOCK_DEVICE);
     options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK] = g_settings_get_boolean 
(options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_SYMBOLIC_LINK);
     options.filter.hidden = g_settings_get_boolean (options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_DOTFILE);
-    options.filter.backup = gnome_cmd_data_get_bool ("/options/backup_filter", TRUE);
+    options.filter.backup = g_settings_get_boolean (options.gcmd_settings->filter, 
GCMD_SETTINGS_FILTER_BACKUP);
 
     options.select_dirs = gnome_cmd_data_get_bool ("/sort/select_dirs", TRUE);
     options.case_sens_sort = gnome_cmd_data_get_bool ("/sort/case_sensitive", TRUE);
@@ -2293,7 +2304,7 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_BLOCK_DEVICE, 
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_BLOCK_DEVICE]));
     set_gsettings_when_changed      (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_SYMBOLIC_LINK, 
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK]));
     set_gsettings_when_changed      (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_DOTFILE, 
&(options.filter.hidden));
-    gnome_cmd_data_set_bool   ("/options/backup_filter", options.filter.backup);
+    set_gsettings_when_changed      (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_BACKUP, 
&(options.filter.backup));
 
     gnome_cmd_data_set_bool   ("/sort/select_dirs", options.select_dirs);
     gnome_cmd_data_set_bool   ("/sort/case_sensitive", options.case_sens_sort);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index eb7b81a..ad124a8 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -73,6 +73,7 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_FILTER_HIDE_BLOCK_DEVICE        "hide-block-device"
 #define GCMD_SETTINGS_FILTER_HIDE_SYMBOLIC_LINK       "hide-symbolic-link"
 #define GCMD_SETTINGS_FILTER_DOTFILE                  "hide-dotfile"
+#define GCMD_SETTINGS_FILTER_BACKUP                   "hide-backup-files"
 
 struct GnomeCmdConRemote;