← Back to branch summary

~indicator-multiload/indicator-multiload/trunk

« back to all changes in this revision

Viewing changes to src/settingsconversion.vala

  • Committer: Michael Hofmann
  • Date: 2013-02-20 22:34:46 UTC
  • Revision ID: mh21@mh21.de-20130220223446-conxev9p6alj850s
Remove obsolete background settings, non-converted keys, set settings version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/settingsconversion.vala
31
31
        } else {
32
32
            this.convert_version1();
33
33
        }
34
 
        //settings.set_value("settings-version", 3u);
 
34
        settings.set_value("settings-version", 3u);
35
35
    }
36
36
 
37
37
    private void convert_version1() {
137
137
 
138
138
    private void copysettings(Settings oldsettings, Settings newsettings, string[] ignore) {
139
139
        foreach (var key in oldsettings.list_keys()) {
 
140
            var value = oldsettings.get_value(key);
 
141
            oldsettings.reset(key);
140
142
            if (key in ignore)
141
143
                continue;
142
 
            var value = oldsettings.get_value(key);
143
 
            oldsettings.reset(key);
144
144
            var defaultvalue = oldsettings.get_value(key);
145
145
            if (!value.equal(defaultvalue))
146
146
                newsettings.set_value(key, value);