mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-08 03:18:03 +02:00
Made proxy DLL names unique
This commit is contained in:
parent
25f384cad9
commit
8056390e00
3 changed files with 10 additions and 9 deletions
|
|
@ -64,15 +64,16 @@ namespace DBus
|
|||
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
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ namespace DBus
|
|||
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));
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ namespace DBus
|
|||
{
|
||||
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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue