Merge lp:~ubuntu-branches/ubuntu/oneiric/tomboy/oneiric-201107271207 into lp:ubuntu/oneiric/tomboy

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/tomboy reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/tomboy/oneiric-201107271207. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

83. By Iain Lane on 2011-07-27

Run dh_autoreconf with --as-needed to enable support in ltmain.sh

82. By Iain Lane on 2011-07-27

* Merge with Debian experimental, remaning changes:
  + Use dh-translations instead of manually stripping schema
  + Ubuntu patches:
    - Add Launchpad integration
    - Use Ubuntu One SSO
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
  + autoreconf for some of the above changes
* Refresh patches that don't apply cleanly
* [6a8551d] Imported Upstream version 1.7.2
  + New addin for advanced preferences
  + Remove minumum size on Search All Notes window
  + Fix note title matching in TrieTree
  + Enforce minimum size on Name column in Search All Notes window

81. By Iain Lane on 2011-07-27

Merging shared upstream rev into target branch.

80. By Iain Lane on 2011-07-27

Use unapply-patches to satisfy bzr merge-package

=== removed directory '.pc/01_dllmaps.patch'
=== removed directory '.pc/01_dllmaps.patch/Tomboy'
=== removed file '.pc/01_dllmaps.patch/Tomboy/Tomboy.exe.config.in'
--- .pc/01_dllmaps.patch/Tomboy/Tomboy.exe.config.in	2011-06-21 16:42:35 +0000
+++ .pc/01_dllmaps.patch/Tomboy/Tomboy.exe.config.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>	
-  <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
-  <dllmap dll="libtomboy" target="libtomboy.so"/>
-  <dllmap dll="panel-applet-2" target="libpanel-applet-2.so.0"/>
-</configuration>

=== removed directory '.pc/10_disable_unit_tests'
=== removed directory '.pc/10_disable_unit_tests/Tomboy'
=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins'
=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService'
=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api'
=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests'
=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the 
-// "Software"), to deal in the Software without restriction, including 
-// without limitation the rights to use, copy, modify, merge, publish, 
-// distribute, sublicense, and/or sell copies of the Software, and to 
-// permit persons to whom the Software is furnished to do so, subject to 
-// the following conditions: 
-//  
-// The above copyright notice and this permission notice shall be 
-// included in all copies or substantial portions of the Software. 
-//  
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
-// 
-// Authors: 
-//      Sandy Armstrong <[e-mail]>
-// 
-
-#if ENABLE_TESTS
-
-using System;
-
-using Tomboy.WebSync.Api;
-using Hyena.Json;
-
-using NUnit.Framework;
-
-namespace Tomboy.WebSync.Api.Tests
-{
-	[TestFixture]
-	public class NoteInfoTests
-	{
-		[Test]
-		public void ParseTest ()
-		{
-			Deserializer deserializer = new Deserializer ();
-
-			string noteJson = "{\"guid\": \"002e91a2-2e34-4e2d-bf88-21def49a7705\"," +
-				"\"title\" :\"New Note 6\"," +
-				"\"note-content\" :\"New Note 6\\nDescribe youre note <b>here</b>.\"," +
-				"\"note-content-version\" : 0.2," +
-				"\"last-change-date\" : \"2009-04-19T21:29:23.2197340-07:00\"," +
-				"\"last-metadata-change-date\" : \"2009-04-19T21:29:23.2197340-07:00\"," +
-				"\"create-date\" : \"2008-03-06T13:44:46.4342680-08:00\"," +
-				"\"last-sync-revision\" : 57," +
-				"\"open-on-startup\" : false," +
-				"\"tags\" : [\"tag1\",\"tag2\"]" +
-				"}";
-			deserializer.SetInput (noteJson);
-			JsonObject noteObj = (JsonObject) deserializer.Deserialize ();
-			//Assert.AreEqual (57, (int)noteObj["last-sync-revision"]);
-			NoteInfo note = NoteInfo.ParseJson (noteObj);
-			Assert.AreEqual ("002e91a2-2e34-4e2d-bf88-21def49a7705", note.Guid, "GUID");
-			Assert.AreEqual ("New Note 6\nDescribe youre note <b>here</b>.", note.NoteContent, "NoteContent");
-			Assert.AreEqual (0.2, note.NoteContentVersion, "NoteContentVersion");
-			Assert.AreEqual ("New Note 6", note.Title, "Title");
-			Assert.AreEqual (DateTime.Parse ("2009-04-19T21:29:23.2197340-07:00"),
-					note.LastChangeDate, "LastChangeDate");
-			Assert.AreEqual (DateTime.Parse ("2009-04-19T21:29:23.2197340-07:00"),
-					note.LastMetadataChangeDate, "LastMetadataChangeDate");
-			Assert.AreEqual (DateTime.Parse ("2008-03-06T13:44:46.4342680-08:00"),
-					note.CreateDate, "CreateDate");
-			Assert.AreEqual (57, note.LastSyncRevision, "LastSyncRevision");
-
-			Assert.IsTrue (note.OpenOnStartup.HasValue, "OpenOnStartup should have value");
-			Assert.IsFalse (note.OpenOnStartup.Value, "OpenOnStartup value");
-			
-			Assert.IsNotNull (note.Tags, "Tags should not be null");
-
-			// TODO: Test resourceref,command,lack of guid,nullables,etc,
-			//       ApplicationException when missing comma in string, wrong type, etc
-		}
-	}
-}
-
-#endif
\ No newline at end of file

=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the 
-// "Software"), to deal in the Software without restriction, including 
-// without limitation the rights to use, copy, modify, merge, publish, 
-// distribute, sublicense, and/or sell copies of the Software, and to 
-// permit persons to whom the Software is furnished to do so, subject to 
-// the following conditions: 
-//  
-// The above copyright notice and this permission notice shall be 
-// included in all copies or substantial portions of the Software. 
-//  
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
-// 
-// Authors: 
-//      Sandy Armstrong <[e-mail]>
-// 
-
-#if ENABLE_TESTS
-
-using System;
-
-using Tomboy.WebSync.Api;
-using Hyena.Json;
-
-using NUnit.Framework;
-
-namespace Tomboy.WebSync.Api.Tests
-{
-	[TestFixture]
-	public class ResourceReferenceTests
-	{
-		[Test]
-		public void ParseTest ()
-		{
-			Deserializer deserializer = new Deserializer ();
-			
-			string refJson =
-				"{ \"api-ref\" : \"http://domain/api/1.0/sally/notes\", \"href\" : \"http://domain/sally/notes\"}";
-			deserializer.SetInput (refJson);
-			JsonObject refObj = (JsonObject) deserializer.Deserialize ();
-			ResourceReference resourceRef = ResourceReference.ParseJson (refObj);
-
-			Assert.AreEqual ("http://domain/api/1.0/sally/notes",
-			                 resourceRef.ApiRef,
-			                 "ApiRef");
-			Assert.AreEqual ("http://domain/sally/notes",
-			                 resourceRef.Href,
-			                 "Href");
-
-			refJson =
-				"{ \"api-ref\" : \"http://domain/api/1.0/sally/notes\"}";
-			deserializer.SetInput (refJson);
-			refObj = (JsonObject) deserializer.Deserialize ();
-			resourceRef = ResourceReference.ParseJson (refObj);
-
-			Assert.AreEqual ("http://domain/api/1.0/sally/notes",
-			                 resourceRef.ApiRef,
-			                 "ApiRef");
-			Assert.IsNull (resourceRef.Href, "Href should be null when none specified");
-
-			refJson =
-				"{ \"href\" : \"http://domain/sally/notes\"}";
-			deserializer.SetInput (refJson);
-			refObj = (JsonObject) deserializer.Deserialize ();
-			resourceRef = ResourceReference.ParseJson (refObj);
-
-			Assert.AreEqual ("http://domain/sally/notes",
-			                 resourceRef.Href,
-			                 "Href");
-			Assert.IsNull (resourceRef.ApiRef, "ApiRef should be null when none specified");
-		}
-
-		[Test]
-		public void ExceptionTest ()
-		{
-			bool expectedExceptionRaised = false;
-			try {
-				ResourceReference.ParseJson (null);
-			} catch (ArgumentNullException) {
-				expectedExceptionRaised = true;
-			}
-			Assert.IsTrue (expectedExceptionRaised,
-			               "ArgumentNullException expected on null input");
-
-			expectedExceptionRaised = false;
-			
-			Deserializer deserializer = new Deserializer ();
-			string invalidRefJson =
-				"{ \"api-ref\" : 5, \"href\" : \"http://domain/sally/notes\"}";
-			deserializer.SetInput (invalidRefJson);
-			JsonObject refObj = (JsonObject) deserializer.Deserialize ();
-			try {
-				ResourceReference.ParseJson (refObj);
-			} catch (InvalidCastException) {
-				expectedExceptionRaised = true;
-			}
-			Assert.IsTrue (expectedExceptionRaised,
-			               "InvalidCastException expected on invalid input");
-		}
-	}
-}
-
-#endif
\ No newline at end of file

=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the 
-// "Software"), to deal in the Software without restriction, including 
-// without limitation the rights to use, copy, modify, merge, publish, 
-// distribute, sublicense, and/or sell copies of the Software, and to 
-// permit persons to whom the Software is furnished to do so, subject to 
-// the following conditions: 
-//  
-// The above copyright notice and this permission notice shall be 
-// included in all copies or substantial portions of the Software. 
-//  
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
-// 
-// Authors: 
-//      Sandy Armstrong <[e-mail]>
-// 
-
-#if ENABLE_TESTS
-
-using System;
-
-namespace Tomboy.WebSync.Api.Tests
-{
-	public class UserInfoTests
-	{
-	}
-}
-
-#endif
\ No newline at end of file

=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json'
=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests'
=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-//
-// DeserializerTests.cs
-//
-// Author:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright (C) 2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if ENABLE_TESTS
-
-using System;
-using System.Reflection;
-using NUnit.Framework;
-
-using Hyena.Json;
-
-namespace Hyena.Json.Tests
-{
-    [TestFixture]
-    public class DeserializerTests
-    {
-        private Deserializer deserializer;
-        
-        [TestFixtureSetUp]
-        public void Setup ()
-        {
-            deserializer = new Deserializer ();
-        }
-        
-        [Test]
-        public void Literal ()
-        {
-            Assert.AreEqual ("hello", (string)deserializer.SetInput ("\"hello\"").Deserialize ());
-            Assert.AreEqual (-1.76e-3, (double)deserializer.SetInput ("-1.76e-3").Deserialize ());
-            Assert.AreEqual (null, deserializer.SetInput ("null").Deserialize ());
-            Assert.AreEqual (true, (bool)deserializer.SetInput ("true").Deserialize ());
-            Assert.AreEqual (false, (bool)deserializer.SetInput ("false").Deserialize ());
-        }
-        
-        [Test]
-        public void Array ()
-        {
-            JsonArray array = (JsonArray)deserializer.SetInput ("[]").Deserialize ();
-            Assert.AreEqual (0, array.Count);
-            
-            array = (JsonArray)deserializer.SetInput ("[[]]").Deserialize ();
-            Assert.AreEqual (1, array.Count);
-            Assert.AreEqual (0, ((JsonArray)array[0]).Count);
-            
-            array = (JsonArray)deserializer.SetInput ("[[true,[]]]").Deserialize ();
-            Assert.AreEqual (1, array.Count);
-            Assert.AreEqual (2, ((JsonArray)array[0]).Count);
-            Assert.AreEqual (0, ((JsonArray)((JsonArray)array[0])[1]).Count);
-            
-            array = (JsonArray)deserializer.SetInput ("[\"a\", 1.0, true]").Deserialize ();
-            Assert.AreEqual (3, array.Count);
-            Assert.AreEqual ("a", (string)array[0]);
-            Assert.AreEqual (1, (double)array[1]);
-            Assert.AreEqual (true, (bool)array[2]);
-        }
-        
-        [Test]
-        public void Object ()
-        {
-            JsonObject obj = (JsonObject)deserializer.SetInput ("{}").Deserialize ();
-            Assert.AreEqual (0, obj.Count);
-            
-            obj = (JsonObject)deserializer.SetInput ("{\"a\":{}}").Deserialize ();
-            Assert.AreEqual (1, obj.Count);
-            Assert.AreEqual (0, ((JsonObject)obj["a"]).Count);
-            
-            obj = (JsonObject)deserializer.SetInput ("{\"a\":[{\"b\":false},\"c\"]}").Deserialize ();
-            Assert.AreEqual (1, obj.Count);
-            JsonArray arr = (JsonArray)obj["a"];
-            Assert.AreEqual (2, arr.Count);
-            Assert.AreEqual (false, ((JsonObject)arr[0])["b"]);
-            Assert.AreEqual ("c", (string)arr[1]);
-        }
-    }
-}
-
-#endif

=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the 
-// "Software"), to deal in the Software without restriction, including 
-// without limitation the rights to use, copy, modify, merge, publish, 
-// distribute, sublicense, and/or sell copies of the Software, and to 
-// permit persons to whom the Software is furnished to do so, subject to 
-// the following conditions: 
-//  
-// The above copyright notice and this permission notice shall be 
-// included in all copies or substantial portions of the Software. 
-//  
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
-// 
-// Authors: 
-//      Sandy Armstrong <[e-mail]>
-// 
-
-#if ENABLE_TESTS
-
-using System;
-
-using Hyena.Json;
-
-using NUnit.Framework;
-
-namespace Hyena.Json.Tests
-{
-    [TestFixture]
-    public class SerializerTests
-    {
-        [Test]
-        public void SerializeBoolTest ()
-        {
-            Serializer ser = new Serializer (true);
-            Assert.AreEqual ("true", ser.Serialize ());
-            ser.SetInput (false);
-            Assert.AreEqual ("false", ser.Serialize ());
-        }
-        
-        [Test]
-        public void SerializeIntTest ()
-        {
-            Serializer ser = new Serializer (12);
-            Assert.AreEqual ("12", ser.Serialize ());
-            ser.SetInput (-658);
-            Assert.AreEqual ("-658", ser.Serialize ());
-            ser.SetInput (0);
-            Assert.AreEqual ("0", ser.Serialize ());
-        }
-        
-        [Test]
-        public void SerializeDoubleTest ()
-        {
-            Serializer ser = new Serializer (12.5);
-            Assert.AreEqual ("12.5", ser.Serialize ());
-            ser.SetInput (-658.1);
-            Assert.AreEqual ("-658.1", ser.Serialize ());
-            ser.SetInput (0.0);
-            Assert.AreEqual ("0", ser.Serialize ());
-            ser.SetInput (0.1);
-            Assert.AreEqual ("0.1", ser.Serialize ());
-        }
-        
-        [Test]
-        public void SerializeStringTest ()
-        {
-            VerifyString ("The cat\njumped \"over\" the rat! We escape with \\\"",
-                          @"""The cat\njumped \""over\"" the rat! We escape with \\\""""");
-        }
-        
-        [Test]
-        public void EscapedCharactersTest ()
-        {
-            VerifyString ("\\", @"""\\""");
-            VerifyString ("\b", @"""\b""");
-            VerifyString ("\f", @"""\f""");
-            VerifyString ("\n", @"""\n""");
-            VerifyString ("\r", @"""\r""");
-            VerifyString ("\t", @"""\t""");
-            VerifyString ("\u2022", "\"\u2022\"");
-        }
-
-        private void VerifyString (string original, string expectedSerialized)
-        {
-            Serializer ser = new Serializer (original);
-            string output = ser.Serialize ();
-            Assert.AreEqual (expectedSerialized, output, "Serialized Output");
-            Assert.AreEqual (original, new Deserializer (output).Deserialize (),
-                             "Input should be identical after serialized then deserialized back to string");
-        }
-        
-        [Test]
-        public void SerializeNullTest ()
-        {
-            Serializer ser = new Serializer (null);
-            Assert.AreEqual ("null", ser.Serialize ());
-        }
-
-        [Test]
-        public void SerializeArrayTest ()
-        {
-            JsonArray simpleArray = new JsonArray ();
-            simpleArray.Add (1);
-            simpleArray.Add ("text");
-            simpleArray.Add (0.1);
-            simpleArray.Add ("5");
-            simpleArray.Add (false);
-            simpleArray.Add (null);
-
-            Serializer ser = new Serializer (simpleArray);
-            Assert.AreEqual ("[1,\"text\",0.1,\"5\",false,null]",
-                             ser.Serialize ());
-
-            JsonArray emptyArray = new JsonArray ();
-            ser.SetInput (emptyArray);
-            Assert.AreEqual ("[]", ser.Serialize ());
-        }
-
-        // TODO: Test arrays/objects in each other, various levels deep
-
-        [Test]
-        public void SerializeObjectTest ()
-        {
-            JsonObject obj1 = new JsonObject ();
-            obj1 ["intfield"] = 1;
-            obj1 ["text field"] = "text";
-            obj1 ["double-field"] = 0.1;
-            obj1 ["Boolean, Field"] = true;
-            obj1 ["\"Null\"\nfield"] = null;
-
-            Serializer ser = new Serializer (obj1);
-            // Test object equality, since order not guaranteed
-            string output = ser.Serialize ();
-            JsonObject reconstitutedObj1 = (JsonObject) new Deserializer (output).Deserialize ();
-            AssertJsonObjectsEqual (obj1, reconstitutedObj1);
-
-            JsonObject obj2 = new JsonObject ();
-            obj2 ["double-field"] = 0.1;
-            obj2 ["\"Null\"\nfield"] = null;
-            ser.SetInput (obj2);
-            output = ser.Serialize ();
-            Assert.IsTrue ((output == "{\"double-field\":0.1,\"\\\"Null\\\"\\nfield\":null}") ||
-                           (output == "{\"\\\"Null\\\"\\nfield\":null,\"double-field\":0.1}"),
-                           "Serialized output format");
-        }
-
-        private void AssertJsonObjectsEqual (JsonObject expectedObj, JsonObject actualObj)
-        {
-            Assert.AreEqual (expectedObj.Count, actualObj.Count, "Field count");
-            foreach (var expectedPair in expectedObj)
-                Assert.AreEqual (expectedPair.Value,
-                                 actualObj [expectedPair.Key],
-                                 expectedPair.Key + " field");
-        }
-    }
-}
-
-#endif
\ No newline at end of file

=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-//
-// TokenizerTests.cs
-//
-// Author:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright (C) 2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if ENABLE_TESTS
-
-using System;
-using System.Reflection;
-using NUnit.Framework;
-
-using Hyena.Json;
-
-namespace Hyena.Json.Tests
-{
-    [TestFixture]
-    public class TokenizerTests
-    {
-        private Tokenizer tokenizer;
-        
-        [TestFixtureSetUp]
-        public void Setup ()
-        {
-            tokenizer = new Tokenizer ();
-        }
-    
-        [Test]
-        public void Whitespace ()
-        {
-            AssertTokenStream ("");
-            AssertTokenStream (" ");
-            AssertTokenStream ("\f\n\r\t ");
-        }
-        
-        [Test]
-        public void BoolNull ()
-        {
-            // Boolean/null tests
-            AssertTokenStream ("true", Token.Bool (true));
-            AssertTokenStream ("false", Token.Bool (false));
-            AssertTokenStream ("null", Token.Null);
-        }
-        
-        [Test]
-        public void NumberInt ()
-        {
-            // Number tests
-            AssertTokenStream ("0", Token.Integer (0));
-            AssertTokenStream ("-0", Token.Integer (-0));
-            
-            AssertTokenStream ("9", Token.Integer (9));
-            AssertTokenStream ("-9", Token.Integer (-9));
-            
-            AssertTokenStream ("14", Token.Integer (14));
-            AssertTokenStream ("-14", Token.Integer (-14));
-            
-            AssertTokenStream ("15309", Token.Integer (15309));
-            AssertTokenStream ("-15309", Token.Integer (-15309));
-        }
-        
-        [Test]
-        public void NumberFloat ()
-        {
-            AssertTokenStream ("0.0", Token.Number (0.0));
-            AssertTokenStream ("-0.0", Token.Number (-0.0));
-            
-            AssertTokenStream ("1.9", Token.Number (1.9));
-            AssertTokenStream ("-1.9", Token.Number (-1.9));
-            
-            AssertTokenStream ("9.1", Token.Number (9.1));
-            AssertTokenStream ("-9.1", Token.Number (-9.1));
-            
-            AssertTokenStream ("15309.0", Token.Number (15309.0));
-            AssertTokenStream ("15309.9", Token.Number (15309.9));
-            AssertTokenStream ("-15309.01", Token.Number (-15309.01));
-            AssertTokenStream ("-15309.9009", Token.Number (-15309.9009));
-        }
-        
-        [Test]
-        public void NumberExponent ()
-        {
-            AssertTokenStream ("20.6e3", Token.Number (20.6e3));
-            AssertTokenStream ("20.6e+3", Token.Number (20.6e+3));
-            AssertTokenStream ("20.6e-3", Token.Number (20.6e-3));
-            AssertTokenStream ("-20.6e3", Token.Number (-20.6e3));
-            AssertTokenStream ("-20.6e+3", Token.Number (-20.6e+3));
-            AssertTokenStream ("-20.6e-3", Token.Number (-20.6e-3));
-            
-            AssertTokenStream ("1e1", Token.Number (1e1));
-            AssertTokenStream ("1E2", Token.Number (1E2));
-            AssertTokenStream ("1.0e1", Token.Number (1.0e1));
-            AssertTokenStream ("1.0E1", Token.Number (1.0E1));
-        }
-        
-        [Test]
-        public void Strings ()
-        {
-            AssertTokenStream (@"""""", Token.String (""));
-            AssertTokenStream (@"""a""", Token.String ("a"));
-            AssertTokenStream (@"""ab""", Token.String ("ab"));
-            AssertTokenStream (@" ""a b"" ", Token.String ("a b"));
-            AssertTokenStream (@"""\""\""""", Token.String ("\"\""));
-            AssertTokenStream (@" ""a \"" \"" b"" ", Token.String ("a \" \" b"));
-            AssertTokenStream (@"""\ubeef""", Token.String ("\ubeef"));
-            AssertTokenStream (@"""\u00a9""", Token.String ("\u00a9"));
-            AssertTokenStream (@"""\u0000\u0001\u0002""", Token.String ("\u0000\u0001\u0002"));
-            AssertTokenStream (@"""1\uabcdef0""", Token.String ("1\uabcdef0"));
-            AssertTokenStream (@"""\b\f\n\r\t""", Token.String ("\b\f\n\r\t"));
-        }
-        
-        [Test]
-        public void Container ()
-        {
-            AssertTokenStream ("{}", Token.ObjectStart, Token.ObjectFinish);
-            AssertTokenStream ("[]", Token.ArrayStart, Token.ArrayFinish);
-            AssertTokenStream ("{  }", Token.ObjectStart, Token.ObjectFinish);
-            AssertTokenStream ("[  ]", Token.ArrayStart, Token.ArrayFinish);
-            AssertTokenStream ("[{}]", Token.ArrayStart, Token.ObjectStart, Token.ObjectFinish, Token.ArrayFinish);
-            AssertTokenStream ("[[[ { } ]]]", 
-                Token.ArrayStart, Token.ArrayStart, Token.ArrayStart, 
-                Token.ObjectStart, Token.ObjectFinish, 
-                Token.ArrayFinish, Token.ArrayFinish, Token.ArrayFinish);
-        }
-        
-        [Test]
-        public void Array ()
-        {
-            AssertTokenStream ("[1]", Token.ArrayStart, Token.Integer (1), Token.ArrayFinish);
-            AssertTokenStream ("[1,0]", Token.ArrayStart, Token.Integer (1), Token.Comma, Token.Integer (0), Token.ArrayFinish);
-            AssertTokenStream ("[\"a\",true,null]", Token.ArrayStart, Token.String ("a"), Token.Comma, 
-                Token.Bool (true), Token.Comma, Token.Null, Token.ArrayFinish);
-            AssertTokenStream ("[0,1,[[2,[4]],5],6]", Token.ArrayStart, Token.Integer (0), Token.Comma, Token.Integer (1),
-                 Token.Comma, Token.ArrayStart, Token.ArrayStart, Token.Integer (2), Token.Comma, Token.ArrayStart, 
-                 Token.Integer (4), Token.ArrayFinish, Token.ArrayFinish, Token.Comma, Token.Integer (5), Token.ArrayFinish,
-                 Token.Comma, Token.Integer (6), Token.ArrayFinish);
-        }
-        
-        [Test]
-        public void Object ()
-        {
-            AssertTokenStream ("{\"a\":{}}", Token.ObjectStart, Token.String ("a"), Token.Colon, Token.ObjectStart, 
-                Token.ObjectFinish, Token.ObjectFinish);
-            AssertTokenStream ("{\"a\":{\"b\":[],\"c\":false}}", Token.ObjectStart, Token.String ("a"), 
-                Token.Colon, Token.ObjectStart, Token.String ("b"), Token.Colon, Token.ArrayStart, Token.ArrayFinish, 
-                Token.Comma, Token.String ("c"), Token.Colon, Token.Bool (false), Token.ObjectFinish, Token.ObjectFinish);
-            AssertTokenStream ("[{\"a\":{},{}]", Token.ArrayStart, Token.ObjectStart, Token.String ("a"), Token.Colon, 
-                Token.ObjectStart, Token.ObjectFinish, Token.Comma, Token.ObjectStart, Token.ObjectFinish, Token.ArrayFinish);
-        }    
-        
-        private void AssertTokenStream (string input, params Token [] tokens)
-        {
-            int cmp_idx = 0;
-            tokenizer.SetInput (input);
-            
-            while (true) {
-                Token token = tokenizer.Scan ();
-                if (token == null) {
-                    if (cmp_idx != tokens.Length) {
-                        throw new ApplicationException ("Unexpected EOF");
-                    }
-                    break;
-                }
-                
-                Token compare = tokens[cmp_idx++];
-                if (compare.Type != token.Type) {
-                    throw new ApplicationException (String.Format ("TokenTypes do not match (exp {0}, got {1}", 
-                        compare.Type, token.Type));
-                }
-                
-                if (compare.Value == null && token.Value == null) {
-                    continue;
-                }
-                
-                if ((compare.Type == TokenType.Integer && (int)compare.Value != (int)token.Value) ||
-                    (compare.Type == TokenType.Number && (double)compare.Value != (double)token.Value) ||
-                    (compare.Type == TokenType.String && (string)compare.Value != (string)token.Value) ||
-                    (compare.Type == TokenType.Boolean && (bool)compare.Value != (bool)token.Value)) {
-                    throw new ApplicationException ("Token values do not match");
-                }
-            }
-        }
-    }
-}
-
-#endif

=== removed directory '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Tests'
=== removed file '.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs'
--- .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	2011-06-21 16:42:35 +0000
+++ .pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	1970-01-01 00:00:00 +0000
@@ -1,306 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the 
-// "Software"), to deal in the Software without restriction, including 
-// without limitation the rights to use, copy, modify, merge, publish, 
-// distribute, sublicense, and/or sell copies of the Software, and to 
-// permit persons to whom the Software is furnished to do so, subject to 
-// the following conditions: 
-//  
-// The above copyright notice and this permission notice shall be 
-// included in all copies or substantial portions of the Software. 
-//  
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
-// 
-// Authors: 
-//      Sandy Armstrong <[e-mail]>
-// 
-
-#if ENABLE_TESTS
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-
-using Tomboy.WebSync;
-using Tomboy.WebSync.Api;
-
-using NUnit.Framework;
-
-namespace Tomboy.WebSync.Tests
-{
-	[TestFixture]
-	public class NoteConvertTests
-	{
-		[TestFixtureSetUp]
-		public void FixtureSetUp ()
-		{
-			InMemoryPreferencesClient memPrefsClient = new InMemoryPreferencesClient ();
-
-			Type prefsType = typeof (Preferences);
-			FieldInfo prefsClientField =
-				prefsType.GetField ("client", BindingFlags.NonPublic
-				                              | BindingFlags.Static);
-			prefsClientField.SetValue (null, memPrefsClient);
-
-			Type servicesType = typeof (Services);
-			FieldInfo servicesClientField =
-				servicesType.GetField ("prefs", BindingFlags.NonPublic
-				                                | BindingFlags.Static);
-			servicesClientField.SetValue (null, memPrefsClient);
-		}
-
-		[TestFixtureTearDown]
-		public void FixtureTearDown ()
-		{
-			Type prefsType = typeof (Preferences);
-			FieldInfo prefsClientField =
-				prefsType.GetField ("client", BindingFlags.NonPublic
-				                                        | BindingFlags.Static);
-			prefsClientField.SetValue (null, null);
-
-			Type servicesType = typeof (Services);
-			FieldInfo servicesClientField =
-				servicesType.GetField ("client", BindingFlags.NonPublic
-				                                        | BindingFlags.Static);
-			servicesClientField.SetValue (null, null);
-		}
-		
-		[Test]
-		public void ToNoteInfoTest ()
-		{
-			// Note content stress tests
-			string [] titles = new string [18];
-			string [] contents = new string [18];
-			string [] expectedInfoContents = new string [18];
-			
-			titles [0] = "(Untitled 238)";
-			contents [0] = @"<note-content version=""0.1"">
-
-Title Actually on Third Line
-
-(edited before moving to third line)
-
-<link:internal>new note 322</link:internal>
-
-title on second lin</note-content>";
-			expectedInfoContents [0] = @"Title Actually on Third Line
-
-(edited before moving to third line)
-
-<link:internal>new note 322</link:internal>
-
-title on second lin";
-
-			titles [1] = "Title on Fourth Line";
-			contents [1] = @"<note-content version=""0.1"">
-
-
-Title on Fourth Line
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [1] = @"
-Title on Fourth Line
-
-Describe your new note here.";
-
-			titles [2] = "New Note 322";
-			contents [2] = @"<note-content version=""0.1"">
-Title on second lin
-
-(edited after moving to second line)</note-content>";
-			expectedInfoContents [2] = @"Title on second lin
-
-(edited after moving to second line)";
-
-			titles [3] = "New Note 326";
-			contents [3] = @"<note-content version=""0.1"">
-
-
-
-
-
-
-
-New Note 326
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [3] = @"
-
-
-
-
-
-New Note 326
-
-Describe your new note here.";
-
-			titles [4] = "(Untitled 331)";
-			contents [4] = @"<note-content version=""0.1"" />";
-			expectedInfoContents [4] = string.Empty;
-
-			titles [5] = "(Untitled 329)";
-			contents [5] = @"<note-content version=""0.1"">
-Text on second line added after first line totally deleted
-Describe your new note here.</note-content>";
-			expectedInfoContents [5] = @"Text on second line added after first line totally deleted
-Describe your new note here.";
-
-			titles [6] = "Seventy Six trombones in the big parade blah blah blah blah blah blah blah blah hlkjsfdijsdflksjf lsajfsdlj lskjf sljk lsjf sljflsjf lsjkf sljfsl slfj sljfslkjf lsjf lsjf lsj fsdlj fsdlj fsljkf sljkf slfjk slkfj slfj sldfj sljkf lsakjfslajf sljf lsfjk sl dfjlsf j";
-			contents [6] = @"<note-content version=""0.1"">Seventy Six trombones in the big parade blah blah blah blah blah blah blah blah hlkjsfdijsdflksjf lsajfsdlj lskjf sljk lsjf sljflsjf lsjkf sljfsl slfj sljfslkjf lsjf lsjf lsj fsdlj fsdlj fsljkf sljkf slfjk slkfj slfj sldfj sljkf lsakjfslajf sljf lsfjk sl dfjlsf j
-Title on Third Lne yeah?
-
-(edited before moving to second line...didn't mean third)</note-content>";
-			expectedInfoContents [6] = @"Title on Third Lne yeah?
-
-(edited before moving to second line...didn't mean third)";
-
-			titles [7] = "New Note 329";
-			contents [7] = @"<note-content version=""0.1"">New Note 329
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [7] = @"Describe your new note here.";
-
-			titles [8] = "New Note 329";
-			contents [8] = @"<note-content version=""0.1""><note-title>New Note 329</note-title>
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [8] = @"<note-title></note-title>Describe your new note here.";
-
-			titles [9] = "New Note 329";
-			contents [9] = @"<note-content version=""0.1""><note-title><b>New Note 329</b></note-title>
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [9] = @"<note-title><b></b></note-title>Describe your new note here.";
-
-			titles [10] = "New Note 329";
-			contents [10] = @"<note-content version=""0.1""><size:huge><note-title>New Note 329</note-title>
-
-Describe your new note here.</size:huge></note-content>";
-			expectedInfoContents [10] = @"<size:huge><note-title></note-title>Describe your new note here.</size:huge>";
-
-			titles [11] = "New Note 329";
-			contents [11] = @"<note-content version=""0.1""><size:huge>New Note 329
-
-Describe your new note here.</size:huge></note-content>";
-			expectedInfoContents [11] = @"<size:huge>Describe your new note here.</size:huge>";
-
-			titles [12] = "New Note 330";
-			contents [12] = @"<note-content version=""0.1"">New Note 330
-Describe your new note here.</note-content>";
-			expectedInfoContents [12] = @"Describe your new note here.";
-
-			titles [13] = "New Note 331";
-			contents [13] = @"<note-content version=""0.1"">New Note 331
-
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [13] = @"
-Describe your new note here.";
-
-			titles [14] = "New Note 331";
-			contents [14] = @"<note-content version="""">New Note 331
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [14] = @"Describe your new note here.";
-
-			titles [15] = "New Note 331";
-			contents [15] = @"<note-content xmlns:link=""http://beatniksoftware.com/tomboy/link"" xmlns:size=""http://beatniksoftware.com/tomboy/size"" version=""0.1"">New Note 331
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [15] = @"Describe your new note here.";
-
-			titles [16] = "New Note 331";
-			contents [16] = @"<note-content xmlns:link=""http://beatniksoftware.com/tomboy/link"" version=""0.1"" xmlns:size=""http://beatniksoftware.com/tomboy/size"">New Note 331
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [16] = @"Describe your new note here.";
-
-			titles [17] = "New Note 331";
-			contents [17] = @"<note-content version=""0.1"" xmlns:size=""http://beatniksoftware.com/tomboy/size"">New Note 331
-
-Describe your new note here.</note-content>";
-			expectedInfoContents [17] = @"Describe your new note here.";
-			
-
-			for (int i = 0; i < titles.Length; i++) {
-				NoteData data = new NoteData ("note://tomboy/12345");
-				data.Title = titles [i];
-				data.Text = contents [i];
-				string tmpFileName = "ToNoteInfoTest.tmp";
-				File.Create (tmpFileName).Close ();
-				File.SetCreationTime (tmpFileName, new DateTime (2009, 1, 5));
-				File.SetLastWriteTime (tmpFileName, new DateTime (2009, 1, 6));
-	
-				Note note = Note.CreateExistingNote (data, tmpFileName, null);
-				
-				NoteInfo info = NoteConvert.ToNoteInfo (note);
-				Assert.AreEqual (titles [i], info.Title, "Title " + i.ToString ());
-				Assert.AreEqual (expectedInfoContents [i], info.NoteContent, "NoteContent " + i.ToString ());
-				Assert.AreEqual (0.1, info.NoteContentVersion.Value, "NoteContentVersion " + i.ToString ());
-			}
-		}
-	}
-
-	public class InMemoryPreferencesClient : IPreferencesClient
-	{
-		private Dictionary<string, object> prefs =
-			new Dictionary<string, object> ();
-		private Dictionary<string, NotifyEventHandler> events =
-			new Dictionary<string, NotifyEventHandler> ();
-
-		#region IPreferencesClient implementation
-		public void Set (string key, object val)
-		{
-			prefs [key] = val;
-			foreach (string nkey in events.Keys) {
-				NotifyEventHandler handler = events [nkey] as NotifyEventHandler;
-				if (handler != null && key.StartsWith (nkey)) {
-					NotifyEventArgs args = new NotifyEventArgs (key, val);
-					handler (this, args);
-				}
-			}
-		}
-		
-		public object Get (string key)
-		{
-			object val;
-			if (prefs.TryGetValue (key, out val))
-				return val;
-			throw new NoSuchKeyException (key);
-		}
-		
-		public void AddNotify (string dir, NotifyEventHandler notify)
-		{
-			lock (events) {
-				if (!events.ContainsKey (dir))
-					events [dir] = notify;
-				else
-					events [dir] += notify;
-			}
-		}
-		
-		public void RemoveNotify (string dir, NotifyEventHandler notify)
-		{
-			lock (events) {
-				if (events.ContainsKey (dir))
-					events [dir] -= notify;
-			}
-		}
-		
-		public void SuggestSync ()
-		{
-		}
-		#endregion
-	}
-}
-
-#endif
\ No newline at end of file

=== removed directory '.pc/20_remove_pcfile_requires'
=== removed directory '.pc/20_remove_pcfile_requires/data'
=== removed file '.pc/20_remove_pcfile_requires/data/tomboy-addins.pc.in'
--- .pc/20_remove_pcfile_requires/data/tomboy-addins.pc.in	2011-06-21 16:42:35 +0000
+++ .pc/20_remove_pcfile_requires/data/tomboy-addins.pc.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-addinsdir=@libdir@/tomboy/addins
-
-Name: Tomboy Addin Library
-Description: Library providing the interfaces for Tomboy addins
-Requires: gtk-sharp-2.0
-Version: @VERSION@
-Libs: -r:${libdir}/tomboy/Tomboy.exe

=== removed directory '.pc/30_fix_manpage_syntax'
=== removed directory '.pc/30_fix_manpage_syntax/data'
=== removed file '.pc/30_fix_manpage_syntax/data/tomboy.1'
--- .pc/30_fix_manpage_syntax/data/tomboy.1	2011-06-21 16:42:35 +0000
+++ .pc/30_fix_manpage_syntax/data/tomboy.1	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-.TH TOMBOY 1 "October 14, 2004" gnome "GNOME User's Manuals"
-.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-
-.SH NAME
-tomboy \- A simple note-taking application for Gnome
-
-.SH SYNOPSIS
-.B tomboy
-.I "[OPTION] ..."
-
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.BR tomboy
-command.
-./"Instead, it has documentation in the GNU Info format; see below.
-.PP
-.B Tomboy
-is a desktop note-taking application for Linux and Unix. Simple and
-easy to use, but with potential to help you organize the ideas and
-information you deal with every day.
-.PP
-Tomboy's usefulness lies in the ability to relate notes and ideas
-together, using a WikiWiki-like linking system.
-.PP
-When run without any options, the Tomboy note menu appears in the
-Gnome Panel's notification tray area.  Selecting a note from the menu
-displays the note's spatial window.
-.PP
-Changes to notes are saved automatically.  Links to URLs, files, and
-other notes are detected as you type.  Rich editing such as
-highlighting, bold, italics, undo/redo, and variable font sizes are
-supported.
-.PP
-Global keybindings exist to allow fast access to Tomboy notes and
-dialogs.  These keybindings are set in GConf (see below) and may be
-activated from any application.
-
-.SH OPTIONS
-The program follows the usual GNU command line syntax, with
-options starting with two dashes (`--').
-A summary of options are included below.
-.\"For a complete description, see the Info files.
-.TP
-.B \-\-new-note
-Create and display a new note.
-.TP
-.B \-\-new-note TITLE
-Create and display a new note with the title given.
-.TP
-.B \-\-open-note TITLE/URL
-Display the existing note matching TITLE or URL.
-.TP
-.B \-\-start-here
-Display the "Start Here" note.
-.TP
-.B \-\-highlight-search TEXT
-Search and highlight TEXT in the opened note.
-.TP
-.B \-\-help	
-Show summary of options.
-.TP
-.B \-\-version
-Show version of program.
-.TP
-.B \-\-debug
-Turn on debugging output.
-
-.SH "GCONF SETTINGS"
-Tomboy has several preference settings stored in GConf.  Changes to
-Settings are applied instantly to any running Tomboy instance. A
-summary of the GConf settings and their purpose are described below.
-.TP
-.B /apps/tomboy/global_keybindings/open_start_here
-Global X keybinding for displaying the "Start Here" note.
-The default keybinding is <Alt>F11.
-.TP
-.B /apps/tomboy/global_keybindings/show_note_menu
-Global X keybinding for displaying the Tomboy applet's note menu.
-The default keybinding is <Alt>F12.
-.TP
-.B /apps/tomboy/global_keybindings/create_new_note
-Global X keybinding for creating and displaying a new note.
-.TP
-.B /apps/tomboy/global_keybindings/open_recent_changes
-Global X keybinding for opening the recent changes dialog.
-.TP
-.B /apps/tomboy/global_keybindings/open_search
-Global X keybinding for opening the note search dialog.
-
-.SH "SEE ALSO"
-.I http://www.beatniksoftware.com/tomboy/
-.\"The program is documented fully by
-.\".IR "The Rise and Fall of a Fooish Bar" ,
-.\"available via the Info system.
-
-.SH BUGS
-Please send bug reports to the Tomboy mailing list
-([e-mail]) or enter them in the Gnome Bugzilla
-bug tracker (http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
-
-.SH AUTHOR
-Alex Graveley <[e-mail]>
-
-This manual page was originally written by Luca Capello <[e-mail]>.

=== renamed file '.pc/applied-patches' => '.pc/applied-patches.THIS'
=== modified file 'Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs'
--- Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	2011-08-17 12:47:15 +0000
@@ -23,7 +23,7 @@
 //      Sandy Armstrong <[e-mail]>
 // 
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 

=== modified file 'Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs'
--- Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	2011-08-17 12:47:15 +0000
@@ -23,7 +23,7 @@
 //      Sandy Armstrong <[e-mail]>
 // 
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 

=== modified file 'Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs'
--- Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	2011-08-17 12:47:15 +0000
@@ -23,7 +23,7 @@
 //      Sandy Armstrong <[e-mail]>
 // 
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 

=== modified file 'Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs'
--- Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	2011-08-17 12:47:15 +0000
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 using System.Reflection;

=== modified file 'Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs'
--- Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	2011-08-17 12:47:15 +0000
@@ -23,7 +23,7 @@
 //      Sandy Armstrong <[e-mail]>
 // 
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 

=== modified file 'Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs'
--- Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	2011-06-21 16:42:35 +0000
+++ Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	2011-08-17 12:47:15 +0000
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 using System.Reflection;

=== modified file 'Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs'
--- Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	2011-07-06 10:06:49 +0000
+++ Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	2011-08-17 12:47:15 +0000
@@ -23,7 +23,7 @@
 //      Sandy Armstrong <[e-mail]>
 // 
 
-#if false
+#if ENABLE_TESTS
 
 using System;
 using System.Collections.Generic;

=== modified file 'Tomboy/NoteManager.cs'
=== modified file 'Tomboy/RecentChanges.cs'
=== modified file 'Tomboy/Tomboy.exe.config.in'
--- Tomboy/Tomboy.exe.config.in	2011-06-21 16:42:35 +0000
+++ Tomboy/Tomboy.exe.config.in	2011-08-17 12:47:15 +0000
@@ -1,7 +1,7 @@
 <configuration>
-  <dllmap dll="glib-2.0.dll" target="libglib-2.0.so.0"/>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>	
   <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
-  <dllmap dll="libtomboy" target="/usr/lib/tomboy/libtomboy.so"/>
+  <dllmap dll="libtomboy" target="libtomboy.so"/>
   <dllmap dll="panel-applet-2" target="libpanel-applet-2.so.0"/>
 </configuration>

=== modified file 'configure.in'
=== modified file 'data/tomboy-addins.pc.in'
--- data/tomboy-addins.pc.in	2011-06-21 16:42:35 +0000
+++ data/tomboy-addins.pc.in	2011-08-17 12:47:15 +0000
@@ -5,5 +5,6 @@
 
 Name: Tomboy Addin Library
 Description: Library providing the interfaces for Tomboy addins
+Requires: gtk-sharp-2.0
 Version: @VERSION@
 Libs: -r:${libdir}/tomboy/Tomboy.exe

=== modified file 'data/tomboy.1'
--- data/tomboy.1	2011-06-21 16:42:35 +0000
+++ data/tomboy.1	2011-08-17 12:47:15 +0000
@@ -13,6 +13,7 @@
 This manual page documents briefly the
 .BR tomboy
 command.
+./"Instead, it has documentation in the GNU Info format; see below.
 .PP
 .B Tomboy
 is a desktop note-taking application for Linux and Unix. Simple and

=== added file 'debian/source/local-options'
--- debian/source/local-options	1970-01-01 00:00:00 +0000
+++ debian/source/local-options	2011-08-17 12:47:15 +0000
@@ -0,0 +1,1 @@
+unapply-patches

=== modified file 'po/POTFILES.in'