beagle r4528 - trunk/beagle/search/Beagle.Search

[llipka svn gnome org]

Author: llipka
Date: Sat Feb 23 14:09:10 2008
New Revision: 4528
URL: http://svn.gnome.org/viewvc/beagle?rev=4528&view=rev

Log:
Namespace Gtk.Action because it conflicts with System.Action (#518220)

Modified:
   trunk/beagle/search/Beagle.Search/UIManager.cs

Modified: trunk/beagle/search/Beagle.Search/UIManager.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/UIManager.cs	(original)
+++ trunk/beagle/search/Beagle.Search/UIManager.cs	Sat Feb 23 14:09:10 2008
@@ -404,13 +404,13 @@
 		public delegate void ScopeChangedDelegate (ScopeType scope, bool active);
 		public event ScopeChangedDelegate ScopeChanged;
 
-		private void OnScopeChanged (object obj, EventArgs args)
+		private void OnScopeChanged (object o, EventArgs args)
 		{
 			if (ScopeChanged == null)
 				return;
 
-			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Action) obj).Name);			
-			ScopeChanged (scope, ((ToggleAction) obj).Active);
+			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Gtk.Action) o).Name);
+			ScopeChanged (scope, ((ToggleAction) o).Active);
 		}
 
 		public delegate void SortChangedDelegate (SortType scope);
@@ -427,7 +427,7 @@
 
 		private void OnDomainChanged (object o, EventArgs args)
 		{
-			QueryDomain domain = (QueryDomain)Enum.Parse (typeof (QueryDomain), ((Action)o).Name);
+			QueryDomain domain = (QueryDomain)Enum.Parse (typeof (QueryDomain), ((Gtk.Action) o).Name);
 
 			if (DomainChanged != null)
 				DomainChanged (domain, ((ToggleAction)o).Active);