[banshee/stable-1.6] [XmlConfigurationClient] load /etc/skel config
- From: Aaron Bockover <abock src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/stable-1.6] [XmlConfigurationClient] load /etc/skel config
- Date: Tue, 4 May 2010 03:24:16 +0000 (UTC)
commit 9f3dd139735d645ef2f0cc9fa686fe005a915c11
Author: Aaron Bockover <abockover novell com>
Date: Mon May 3 23:16:37 2010 -0400
[XmlConfigurationClient] load /etc/skel config
If there's no existing user config.xml, and one exists in /etc/skel,
then load that one instead of a blank configuration.
.../XmlConfigurationClient.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs b/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs
index 1305899..b2edfce 100644
--- a/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs
+++ b/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs
@@ -42,6 +42,7 @@ namespace Banshee.Configuration
private const string namespace_tag_name = "namespace";
private const string value_tag_name = "value";
private const string tag_identifier_attribute_name = "name";
+ private const string skel_path = "/etc/skel/.config/banshee-1/config.xml";
private static string file_path {
get {
@@ -62,9 +63,18 @@ namespace Banshee.Configuration
xml_document = new XmlDocument();
bool make_new_xml = true;
- if(File.Exists(file_path)) {
+
+ string load_path = null;
+ if (File.Exists (file_path)) {
+ load_path = file_path;
+ } else if (File.Exists (skel_path)) {
+ Hyena.Log.InformationFormat ("Restoring config.xml from {0}", skel_path);
+ load_path = skel_path;
+ }
+
+ if (load_path != null && File.Exists (load_path)) {
try {
- xml_document.Load(file_path);
+ xml_document.Load (load_path);
make_new_xml = false;
} catch { // TODO try recovery?
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]