Move InterfaceAttribute into the main namespace

src/DBus.cs

@@ -3,6 +3,7 @@
 // See COPYING for details
 
 using System;
+using NDesk.DBus;
 
 //namespace org.freedesktop.DBus
 namespace org.freedesktop.DBus
@@ -83,16 +84,4 @@ public interface Bus : Introspectable
 		//undocumented in spec
 		void ReloadConfig ();
 	}
-
-	//Having this as an attribute is a bit silly, no?
-	[AttributeUsage (AttributeTargets.Interface | AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
-	public class InterfaceAttribute : Attribute
-	{
-		public string Name;
-
-		public InterfaceAttribute (string name)
-		{
-			this.Name = name;
-		}
-	}
 }

src/DProxy.cs

@@ -29,11 +29,11 @@ public DProxy (Connection conn, ObjectPath opath, string dest, Type type) : base
 			//note that the foreach is useless since there can be only key
 			//probably does not deal with class inheritance etc.
 
-			foreach (org.freedesktop.DBus.InterfaceAttribute ia in type.GetCustomAttributes (typeof (org.freedesktop.DBus.InterfaceAttribute), false))
+			foreach (InterfaceAttribute ia in type.GetCustomAttributes (typeof (InterfaceAttribute), false))
 				conn.RegisteredTypes[type] = ia.Name;
 
 			foreach (Type t in type.GetInterfaces ())
-				foreach (org.freedesktop.DBus.InterfaceAttribute ia in t.GetCustomAttributes (typeof (org.freedesktop.DBus.InterfaceAttribute), false))
+				foreach (InterfaceAttribute ia in t.GetCustomAttributes (typeof (InterfaceAttribute), false))
 					conn.RegisteredTypes[t] = ia.Name;
 
 			/*
@@ -230,4 +230,15 @@ public static Signature GetSig (Type type)
 			return sig;
 		}
 	}
+
+	[AttributeUsage (AttributeTargets.Interface | AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+	public class InterfaceAttribute : Attribute
+	{
+		public string Name;
+
+		public InterfaceAttribute (string name)
+		{
+			this.Name = name;
+		}
+	}
 }