From: Joe Shaw Date: Wed, 12 Jan 2005 17:31:08 +0000 (+0000) Subject: 2005-01-12 Joe Shaw X-Git-Tag: dbus-0.23~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2388bc86ee7e2b01f36ec6711608601f538eb712;p=thirdparty%2Fdbus.git 2005-01-12 Joe Shaw * mono/Makefile.am: Always build the dbus DLL with --debug. * mono/Arguments.cs (GetDBusTypeConstructor): If the type is an enum, get the enum's underlying type. Another mono 1.1.3 fix. --- diff --git a/ChangeLog b/ChangeLog index 7cea79677..b16bfb40e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-12 Joe Shaw + + * mono/Makefile.am: Always build the dbus DLL with --debug. + + * mono/Arguments.cs (GetDBusTypeConstructor): If the type + is an enum, get the enum's underlying type. Another mono + 1.1.3 fix. + 2005-01-11 Joe Shaw Patch from Sjoerd Simons diff --git a/mono/Arguments.cs b/mono/Arguments.cs index d78fbff2f..b68ed5a37 100644 --- a/mono/Arguments.cs +++ b/mono/Arguments.cs @@ -165,6 +165,8 @@ namespace DBus if (type.IsArray) constructorType = typeof (System.Array); + else if (type.IsEnum) + constructorType = Enum.GetUnderlyingType (type); else constructorType = type.UnderlyingSystemType; diff --git a/mono/Makefile.am b/mono/Makefile.am index 12c9faa5d..0b52050b0 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -51,10 +51,10 @@ DISTCLEANFILES=AssemblyInfo.cs $(ASSEMBLY).config $(ASSEMBLY) all-am: $(TARGET) dbus-sharp.dll: $(DBUS_SHARP_FILES) - $(CSC) --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) AssemblyInfo.cs + $(CSC) --debug --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) AssemblyInfo.cs test-dbus-sharp.exe: $(TEST_DBUS_SHARP_FILES) - $(CSC) --unsafe --target exe -L . -r dbus-sharp.dll -pkg:gtk-sharp -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) + $(CSC) --debug --unsafe --target exe -L . -r dbus-sharp.dll -pkg:gtk-sharp -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) clean: rm -f $(TARGET) $(NOINST_EXES)