Added support for enumerations with marshalling to/from their underlying system type...

diff --git a/mono/DBusType/Byte.cs b/mono/DBusType/Byte.cs
index d5068f2..a3d0ac9 100644 (file)
--- a/mono/DBusType/Byte.cs
+++ b/mono/DBusType/Byte.cs
@@ -41,6 +41,10 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
+      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Byte)) {
+       return true;
+      }
+
       switch (type.ToString()) {
       case "System.Byte":
       case "System.Byte&":
@@ -75,6 +79,10 @@ namespace DBus.DBusType
 
     public object Get(System.Type type)
     {
+      if (type.IsEnum) {
+       return Enum.ToObject(type, this.val);
+      }
+
       switch (type.ToString()) {
       case "System.Byte":
       case "System.Byte&":

diff --git a/mono/DBusType/Int32.cs b/mono/DBusType/Int32.cs
index be78eba..681a55f 100644 (file)
--- a/mono/DBusType/Int32.cs
+++ b/mono/DBusType/Int32.cs
@@ -36,11 +36,14 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
+      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int32)) {
+       return true;
+      }
+      
       switch (type.ToString()) {
       case "System.Int32":
       case "System.Int32&":
-       return true;
-      }
+       return true;      }
       
       return false;
     }
@@ -68,6 +71,10 @@ namespace DBus.DBusType
 
     public object Get(System.Type type)
     {
+      if (type.IsEnum) {
+       return Enum.ToObject(type, this.val);
+      }
+      
       switch (type.ToString()) {
       case "System.Int32":
       case "System.Int32&":

diff --git a/mono/DBusType/Int64.cs b/mono/DBusType/Int64.cs
index 1cc79c7..741d272 100644 (file)
--- a/mono/DBusType/Int64.cs
+++ b/mono/DBusType/Int64.cs
@@ -36,6 +36,10 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
+      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int64)) {
+       return true;
+      }
+
       switch (type.ToString()) {
       case "System.Int64":
       case "System.Int64&":
@@ -68,6 +72,10 @@ namespace DBus.DBusType
 
     public object Get(System.Type type)
     {
+      if (type.IsEnum) {
+       return Enum.ToObject(type, this.val);
+      }
+
       switch (type.ToString()) {
       case "System.Int64":
       case "System.Int64&":

diff --git a/mono/DBusType/UInt32.cs b/mono/DBusType/UInt32.cs
index 4375351..e97aa37 100644 (file)
--- a/mono/DBusType/UInt32.cs
+++ b/mono/DBusType/UInt32.cs
@@ -36,6 +36,10 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
+      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt32)) {
+       return true;
+      }
+
       switch (type.ToString()) {
       case "System.UInt32":
       case "System.UInt32&":
@@ -68,6 +72,10 @@ namespace DBus.DBusType
 
     public object Get(System.Type type)
     {
+      if (type.IsEnum) {
+       return Enum.ToObject(type, this.val);
+      }
+
       switch (type.ToString()) 
        {
        case "System.UInt32":

diff --git a/mono/DBusType/UInt64.cs b/mono/DBusType/UInt64.cs
index 7bcccae..84fef06 100644 (file)
--- a/mono/DBusType/UInt64.cs
+++ b/mono/DBusType/UInt64.cs
@@ -36,6 +36,10 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
+      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt64)) {
+       return true;
+      }
+
       switch (type.ToString()) {
       case "System.UInt64":
       case "System.UInt64&":
@@ -68,6 +72,10 @@ namespace DBus.DBusType
 
     public object Get(System.Type type)
     {
+      if (type.IsEnum) {
+       return Enum.ToObject(type, this.val);
+      }
+
       switch (type.ToString()) 
        {
        case "System.UInt64":