Merge lp:~cszikszoy/do/sysprefs into lp:do

[Chris S.]

Unmerged revisions

1318. By Chris S. on 2010-04-20

remove debug

1317. By Chris S. on 2010-04-14

implement prefs for root paths

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs	2009-08-31 01:58:13 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GConfPreferencesService.cs	2010-04-20 04:11:12 +0000
@@ -25,26 +25,23 @@
 {	
 	public class GConfPreferencesService : IPreferencesService
 	{
-		const string ApplicationRootPath = "/apps/gnome-do/preferences";
+		const string RootPath = "/apps/gnome-do/preferences";
 
 		GConf.Client client;
-		string RootPath { get; set; }
-
-		public GConfPreferencesService () : this (ApplicationRootPath)
-		{
-		}
-
-		public GConfPreferencesService (string rootPath)
-		{
-			RootPath = rootPath;
+
+		public GConfPreferencesService ()
+		{
 			client = new GConf.Client ();
-			client.AddNotify (RootPath, new GConf.NotifyEventHandler (HandleGConfChanged));
+			client.AddNotify ("/", new GConf.NotifyEventHandler (HandleGConfChanged));
 		}
 		
 		void HandleGConfChanged (object sender, GConf.NotifyEventArgs args)
 		{
+			string key = args.Key;
+			if (key.StartsWith (RootPath))
+				key = key.Substring (RootPath.Length + 1);
 			if (PreferencesChanged != null)
-				PreferencesChanged (this, new PreferencesChangedEventArgs (args.Key.Substring(RootPath.Length + 1), args.Value));
+				PreferencesChanged (this, new PreferencesChangedEventArgs (key, args.Value));
 		}
 
 		string AbsolutePathForKey (string key)

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesFactory.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesFactory.cs	2008-12-16 04:22:23 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesFactory.cs	2010-04-20 04:11:12 +0000
@@ -48,7 +48,12 @@
 		/// </returns>
 		public IPreferences Get<TOwner> () where TOwner : class
 		{
-			return new PreferencesImplementation<TOwner> (Service, SecureService);
+			return new PreferencesImplementation (Service, SecureService, typeof (TOwner));
+		}
+		
+		public IPreferences Get (string absolute_key)
+		{
+			return new PreferencesImplementation (Service, SecureService, absolute_key);
 		}
 	}
-}
+}
\ No newline at end of file

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs	2009-08-31 01:58:13 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs	2010-04-20 04:11:12 +0000
@@ -26,27 +26,36 @@
 namespace Do.Platform.Preferences
 {
 	
-	internal class PreferencesImplementation<TOwner> : IPreferences
-		where TOwner : class
+	internal class PreferencesImplementation : IPreferences
 	{
 		IPreferencesService Service { get; set; }
 		IPreferencesService SecureService { get; set; }
 
-		readonly string OwnerString = typeof (TOwner).FullName.Replace (".", "/");
-		
-		public PreferencesImplementation (IPreferencesService service, ISecurePreferencesService secureService)
-		{
-			Service = service;
-			SecureService = new SecurePreferencesServiceWrapper (secureService);
-			Service.PreferencesChanged += HandlePreferencesChanged;
+		readonly string OwnerString;
+		
+		public PreferencesImplementation (IPreferencesService service, ISecurePreferencesService secureService, Type Owner)
+		{
+			Service = service;
+			SecureService = new SecurePreferencesServiceWrapper (secureService);
+			Service.PreferencesChanged += HandlePreferencesChanged;
+			OwnerString = Owner.FullName.Replace (".", "/");
+		}
+		
+		public PreferencesImplementation (IPreferencesService service, ISecurePreferencesService secureService, string absolute_key)
+		{
+			Service = service;
+			SecureService = new SecurePreferencesServiceWrapper (secureService);
+			Service.PreferencesChanged += HandlePreferencesChanged;
+			OwnerString = absolute_key;
+			
 		}
 		
 		void HandlePreferencesChanged (object o, PreferencesChangedEventArgs e)
 		{
-			if (e.Key.Length <= OwnerString.Length + 1 || e.Key.Substring(0, OwnerString.Length) != OwnerString)
+			if (!e.Key.StartsWith (OwnerString))
 				return;
 			if (PreferencesChanged != null)
-				PreferencesChanged (this, new PreferencesChangedEventArgs (e.Key.Substring(OwnerString.Length + 1), e.Value));
+				PreferencesChanged (this, new PreferencesChangedEventArgs (e.Key.Substring (OwnerString.Length + 1), e.Value));
 		}
 
 		#region IPreferences

=== modified file 'Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs'
--- Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs	2009-08-28 05:42:11 +0000
+++ Do.Platform/src/Do.Platform/SecurePreferencesWrapper.cs	2010-04-20 04:11:12 +0000
@@ -61,7 +61,8 @@
 
 		void EnsureString<T> ()
 		{
-			if (typeof (T) != typeof (string)) throw new NotImplementedException ("Unimplemented for non string values");
+			if (typeof (T) != typeof (string)) 
+				throw new NotImplementedException ("Unimplemented for non string values");
 		}
 	}
 }