core,ui: Use both user & system configuration
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Thu, 10 Feb 2011 15:40:39 +0000 (17:40 +0200)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Thu, 10 Feb 2011 23:40:17 +0000 (01:40 +0200)
commitf2346a3a79aa422ce7e82a5e1b111c8de06f0470
tree4c96cd50ba6850af75135b3370841b77ec44a3e5
parent963b5f5a10c6ed06f2c20a01f1ac48fd88cf7097
core,ui: Use both user & system configuration

So far, we have been ignoring the system configuration file when the user
configuration file exists. This leads into problems whenever our
configuration keys change, i-e user configuration goes obsolete.

Now we load configuration from both sources and get the config value from
system configuration if user configuration doesn't offer a value for it.
src/rygel/rygel-user-config.vala