dbus/mono Connection.cs, 1.6, 1.7 Handler.cs, 1.3, 1.4 Service.cs, 1.4, 1.5

[Owen Fraser-Green]

Update of /cvs/dbus/dbus/mono
In directory pdx:/tmp/cvs-serv17938

Modified Files:
	Connection.cs Handler.cs Service.cs 
Log Message:
Made proxy DLL names unique


Index: Connection.cs
===================================================================
RCS file: /cvs/dbus/dbus/mono/Connection.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/Connection.cs	26 Mar 2004 15:25:59 -0000	1.6
+++ b/Connection.cs	3 Apr 2004 22:00:40 -0000	1.7
@@ -64,15 +64,16 @@
     internal static Connection Wrap(IntPtr rawConnection) 
     {
       if (slot > -1) {
-	// If we already have a Connection object associated with this rawConnection then return it
+	// Maybe we already have a Connection object associated with
+	// this rawConnection then return it
 	IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-	return (DBus.Connection) ((GCHandle)rawThis).Target;
-      } 
-      else 
-	{
-	  // If it doesn't exist then create a new connection around it
-	  return new Connection(rawConnection);
+	if (rawThis != IntPtr.Zero) {
+	  return (DBus.Connection) ((GCHandle)rawThis).Target;
 	}
+      }
+      
+      // If it doesn't exist then create a new connection around it
+      return new Connection(rawConnection);
     }
 
     public int Timeout

Index: Handler.cs
===================================================================
RCS file: /cvs/dbus/dbus/mono/Handler.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/Handler.cs	26 Mar 2004 15:25:59 -0000	1.3
+++ b/Handler.cs	3 Apr 2004 22:00:40 -0000	1.4
@@ -72,7 +72,7 @@
       pathName = pathName.TrimStart('/');
       this.path = pathName.Split('/');
       this.pathName = "/" + pathName;
-
+      
       // Create the vTable and register the path
       vTable = new DBusObjectPathVTable(new DBusObjectPathUnregisterFunction(Unregister_Called), 
 					new DBusObjectPathMessageFunction(Message_Called));

Index: Service.cs
===================================================================
RCS file: /cvs/dbus/dbus/mono/Service.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/Service.cs	26 Mar 2004 15:25:59 -0000	1.4
+++ b/Service.cs	3 Apr 2004 22:00:40 -0000	1.5
@@ -167,7 +167,7 @@
     {
       get {
 	if (this.module == null) {
-	  this.module = ProxyAssembly.DefineDynamicModule(Name, "proxy.dll", true);
+	  this.module = ProxyAssembly.DefineDynamicModule(Name, Name + ".proxy.dll", true);
 	}
 	
 	return this.module;