tomboy r2137 - in trunk: . Tomboy/Gnome.Keyring

[sharm svn gnome org]

Author: sharm
Date: Sun Sep 14 20:55:09 2008
New Revision: 2137
URL: http://svn.gnome.org/viewvc/tomboy?rev=2137&view=rev

Log:
* Tomboy/Gnome.Keyring/ResultCode.cs, Tomboy/Gnome.Keyring/Ring.cs:
  Support "NoMatch" result code.  Fixes bug #499841, patch courtesy
  of Alexey Nedilko.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Gnome.Keyring/ResultCode.cs
   trunk/Tomboy/Gnome.Keyring/Ring.cs

Modified: trunk/Tomboy/Gnome.Keyring/ResultCode.cs
==============================================================================
--- trunk/Tomboy/Gnome.Keyring/ResultCode.cs	(original)
+++ trunk/Tomboy/Gnome.Keyring/ResultCode.cs	Sun Sep 14 20:55:09 2008
@@ -37,7 +37,8 @@
 		BadArguments,
 		IOError,
 		Cancelled,
-		AlreadyExists
+		AlreadyExists,
+		NoMatch
 	}
 }
 

Modified: trunk/Tomboy/Gnome.Keyring/Ring.cs
==============================================================================
--- trunk/Tomboy/Gnome.Keyring/Ring.cs	(original)
+++ trunk/Tomboy/Gnome.Keyring/Ring.cs	Sun Sep 14 20:55:09 2008
@@ -265,7 +265,8 @@
 			try {
 				resp = SendRequest (req.Stream);
 			} catch (KeyringException ke) {
-				if (ke.ResultCode == ResultCode.Denied)
+				if (ke.ResultCode == ResultCode.Denied ||
+				    ke.ResultCode == ResultCode.NoMatch)
 					return empty_item_data;
 				throw;
 			}
@@ -308,7 +309,8 @@
 			try {
 				resp = SendRequest (req.Stream);
 			} catch (KeyringException ke) {
-				if (ke.ResultCode == ResultCode.Denied)
+				if (ke.ResultCode == ResultCode.Denied ||
+				    ke.ResultCode == ResultCode.NoMatch)
 					return empty_net_item_data;
 				throw;
 			}