rpms/dbus-sharp/devel dbus-sharp-gchandle.patch, NONE, 1.1 dbus-sharp.spec, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/dbus-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26376

Modified Files:
	dbus-sharp.spec 
Added Files:
	dbus-sharp-gchandle.patch 
Log Message:
* Wed Aug 30 2006 Alexander Larsson <alexl at redhat.com> - 0.63-6
- Fix connection and message gc problem (#187452)
- Patch from Christian Krause



dbus-sharp-gchandle.patch:
 Connection.cs |    2 +-
 Message.cs    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dbus-sharp-gchandle.patch ---
--- dbus-sharp-0.63/mono/Connection.cs.gchandle	2006-08-30 15:14:28.000000000 +0200
+++ dbus-sharp-0.63/mono/Connection.cs	2006-08-30 15:17:01.000000000 +0200
@@ -116,7 +116,7 @@
 	// Maybe we already have a Connection object associated with
 	// this rawConnection then return it
 	IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) {
+	if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) {
 	  return (DBus.Connection) ((GCHandle)rawThis).Target;
 	}
       }
--- dbus-sharp-0.63/mono/Message.cs.gchandle	2006-08-30 15:14:20.000000000 +0200
+++ dbus-sharp-0.63/mono/Message.cs	2006-08-30 15:16:45.000000000 +0200
@@ -110,7 +110,7 @@
       if (slot > -1) {
 	// If we already have a Message object associated with this rawMessage then return it
 	IntPtr rawThis = dbus_message_get_data(rawMessage, slot);
-	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message))
+	if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null))
 	  return (DBus.Message) ((GCHandle)rawThis).Target;
       } 
       // If it doesn't exist then create a new Message around it


Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-sharp/devel/dbus-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbus-sharp.spec	18 Aug 2006 15:11:22 -0000	1.5
+++ dbus-sharp.spec	30 Aug 2006 13:21:28 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -20,6 +20,7 @@
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 Patch1: dbus-sharp-0.63-nogtk.patch
+Patch2: dbus-sharp-gchandle.patch
 
 %description
 
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .nogtk
+%patch2 -p1 -b .gchandle
 
 %build
 autoreconf --force --install
@@ -63,6 +65,10 @@
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* Wed Aug 30 2006 Alexander Larsson <alexl at redhat.com> - 0.63-6
+- Fix connection and message gc problem (#187452)
+- Patch from Christian Krause
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.63-5
 - Update for new mono multilib setup
 - Don't buildrequire old gtk-sharp