@gtkx/ffi 0.1.35 → 0.1.36

package/dist/generated/gio/dbus-interface-skeleton.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError, wrapPtr } from "@gtkx/ffi";
+import { NativeError, getObject } from "@gtkx/ffi";
 import { DBusInterfaceInfo } from "./dbus-interface-info.js";
 import { DBusConnection } from "./dbus-connection.js";
 import { DBusObject } from "./dbus-object.js";
@@ -36,7 +36,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
             {
@@ -77,7 +77,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusConnection);
+        return getObject(ptr, DBusConnection);
     }
     getConnections() {
         const ptrs = call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_connections", [
@@ -91,7 +91,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             listType: "glist",
             borrowed: true,
         });
-        return ptrs.map((ptr) => wrapPtr(ptr, DBusConnection));
+        return ptrs.map((ptr) => getObject(ptr, DBusConnection));
     }
     getFlags() {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_flags", [
@@ -113,7 +113,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             innerType: "GDBusInterfaceInfo",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, DBusInterfaceInfo);
+        return getObject(ptr, DBusInterfaceInfo);
     }
     getObjectPath() {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_object_path", [
@@ -135,7 +135,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             innerType: "GVariant",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, GLib.Variant);
+        return getObject(ptr, GLib.Variant);
     }
     getVtable() {
         return call("libgio-2.0.so.0", "g_dbus_interface_skeleton_get_vtable", [
@@ -152,7 +152,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
         ], { type: "boolean" });
@@ -184,7 +184,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
         ], { type: "undefined" });
@@ -198,7 +198,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusObject);
+        return getObject(ptr, DBusObject);
     }
     setObject(object) {
         call("libgio-2.0.so.0", "g_dbus_interface_set_object", [
@@ -207,7 +207,7 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: object?.ptr ?? object,
             },
         ], { type: "undefined" });
@@ -220,13 +220,13 @@ export class DBusInterfaceSkeleton extends GObject.GObject {
             : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], DBusInterfaceSkeleton);
+            const self = getObject(args[0], DBusInterfaceSkeleton);
             const signalArgs = args.slice(1);
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
                 if (m.getCls && signalArgs[i] != null) {
-                    return wrapPtr(signalArgs[i], m.getCls());
+                    return getObject(signalArgs[i], m.getCls());
                 }
                 return signalArgs[i];
             });

package/dist/generated/gio/dbus-interface.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { DBusInterfaceInfo } from "./dbus-interface-info.js";
 import { DBusObject } from "./dbus-object.js";
 export class DBusInterface {
@@ -19,7 +19,7 @@ export class DBusInterface {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusObject);
+        return getObject(ptr, DBusObject);
     }
     getInfo() {
         const ptr = call("libgio-2.0.so.0", "g_dbus_interface_get_info", [
@@ -33,7 +33,7 @@ export class DBusInterface {
             innerType: "GDBusInterfaceInfo",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, DBusInterfaceInfo);
+        return getObject(ptr, DBusInterfaceInfo);
     }
     setObject(object) {
         call("libgio-2.0.so.0", "g_dbus_interface_set_object", [
@@ -42,7 +42,7 @@ export class DBusInterface {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: object?.ptr ?? object,
             },
         ], { type: "undefined" });

package/dist/generated/gio/dbus-menu-model.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { MenuModel } from "./menu-model.js";
 export class DBusMenuModel extends MenuModel {
     constructor(...args) {
@@ -19,7 +19,7 @@ export class DBusMenuModel extends MenuModel {
     static get(connection, objectPath, busName) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_menu_model_get", [
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
             {
@@ -31,14 +31,14 @@ export class DBusMenuModel extends MenuModel {
                 value: objectPath,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusMenuModel);
+        return getObject(ptr, DBusMenuModel);
     }
     connect(signal, handler, after = false) {
         const selfType = { type: "gobject", borrowed: true };
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], DBusMenuModel);
+            const self = getObject(args[0], DBusMenuModel);
             return handler(self, ...args.slice(1));
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [

package/dist/generated/gio/dbus-message.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError, wrapPtr } from "@gtkx/ffi";
+import { NativeError, getObject } from "@gtkx/ffi";
 import { UnixFDList } from "./unix-fdlist.js";
 import * as GLib from "../glib/index.js";
 import * as GObject from "../gobject/index.js";
@@ -25,7 +25,7 @@ export class DBusMessage extends GObject.GObject {
                 value: capabilities,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     static messageNewMethodCall(path, method, name, interface_) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_message_new_method_call", [
@@ -46,7 +46,7 @@ export class DBusMessage extends GObject.GObject {
                 value: method,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     static messageNewSignal(path, interface_, signal) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_message_new_signal", [
@@ -63,7 +63,7 @@ export class DBusMessage extends GObject.GObject {
                 value: signal,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     createPtr(_args) {
         return call("libgio-2.0.so.0", "g_dbus_message_new", [], {
@@ -124,7 +124,7 @@ export class DBusMessage extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     getArg0() {
         return call("libgio-2.0.so.0", "g_dbus_message_get_arg0", [
@@ -156,7 +156,7 @@ export class DBusMessage extends GObject.GObject {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, GLib.Variant);
+        return getObject(ptr, GLib.Variant);
     }
     getByteOrder() {
         return call("libgio-2.0.so.0", "g_dbus_message_get_byte_order", [
@@ -208,7 +208,7 @@ export class DBusMessage extends GObject.GObject {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, GLib.Variant);
+        return getObject(ptr, GLib.Variant);
     }
     getHeaderFields() {
         return call("libgio-2.0.so.0", "g_dbus_message_get_header_fields", [
@@ -307,7 +307,7 @@ export class DBusMessage extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, UnixFDList);
+        return getObject(ptr, UnixFDList);
     }
     lock() {
         call("libgio-2.0.so.0", "g_dbus_message_lock", [
@@ -332,7 +332,7 @@ export class DBusMessage extends GObject.GObject {
                 value: errorMessage,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     newMethodReply() {
         const ptr = call("libgio-2.0.so.0", "g_dbus_message_new_method_reply", [
@@ -341,7 +341,7 @@ export class DBusMessage extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     print(indent) {
         return call("libgio-2.0.so.0", "g_dbus_message_print", [
@@ -364,6 +364,7 @@ export class DBusMessage extends GObject.GObject {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GVariant",
                     lib: "libgio-2.0.so.0",
                 },
@@ -432,6 +433,7 @@ export class DBusMessage extends GObject.GObject {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GVariant",
                     lib: "libgio-2.0.so.0",
                 },
@@ -554,7 +556,7 @@ export class DBusMessage extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: fdList?.ptr ?? fdList,
             },
         ], { type: "undefined" });
@@ -623,7 +625,7 @@ export class DBusMessage extends GObject.GObject {
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], DBusMessage);
+            const self = getObject(args[0], DBusMessage);
             return handler(self, ...args.slice(1));
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [

package/dist/generated/gio/dbus-method-info.js

@@ -1,5 +1,5 @@
 import { alloc, call, read, write } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 export class DBusMethodInfo {
     ptr;
     constructor(init = {}) {
@@ -23,7 +23,7 @@ export class DBusMethodInfo {
             innerType: "GDBusMethodInfo",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, DBusMethodInfo);
+        return getObject(ptr, DBusMethodInfo);
     }
     unref() {
         call("libgio-2.0.so.0", "g_dbus_method_info_unref", [

package/dist/generated/gio/dbus-method-invocation.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { DBusMethodInfo } from "./dbus-method-info.js";
 import { DBusPropertyInfo } from "./dbus-property-info.js";
 import { DBusConnection } from "./dbus-connection.js";
@@ -24,7 +24,7 @@ export class DBusMethodInvocation extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusConnection);
+        return getObject(ptr, DBusConnection);
     }
     getInterfaceName() {
         return call("libgio-2.0.so.0", "g_dbus_method_invocation_get_interface_name", [
@@ -41,7 +41,7 @@ export class DBusMethodInvocation extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusMessage);
+        return getObject(ptr, DBusMessage);
     }
     getMethodInfo() {
         const ptr = call("libgio-2.0.so.0", "g_dbus_method_invocation_get_method_info", [
@@ -57,7 +57,7 @@ export class DBusMethodInvocation extends GObject.GObject {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusMethodInfo);
+        return getObject(ptr, DBusMethodInfo);
     }
     getMethodName() {
         return call("libgio-2.0.so.0", "g_dbus_method_invocation_get_method_name", [
@@ -87,7 +87,7 @@ export class DBusMethodInvocation extends GObject.GObject {
             innerType: "GVariant",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, GLib.Variant);
+        return getObject(ptr, GLib.Variant);
     }
     getPropertyInfo() {
         const ptr = call("libgio-2.0.so.0", "g_dbus_method_invocation_get_property_info", [
@@ -103,7 +103,7 @@ export class DBusMethodInvocation extends GObject.GObject {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusPropertyInfo);
+        return getObject(ptr, DBusPropertyInfo);
     }
     getSender() {
         return call("libgio-2.0.so.0", "g_dbus_method_invocation_get_sender", [
@@ -156,7 +156,12 @@ export class DBusMethodInvocation extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "boxed", innerType: "GError", lib: "libgio-2.0.so.0" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GError",
+                    lib: "libgio-2.0.so.0",
+                },
                 value: error?.ptr ?? error,
             },
         ], { type: "undefined" });
@@ -170,6 +175,7 @@ export class DBusMethodInvocation extends GObject.GObject {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GVariant",
                     lib: "libgio-2.0.so.0",
                 },
@@ -186,13 +192,14 @@ export class DBusMethodInvocation extends GObject.GObject {
             {
                 type: {
                     type: "boxed",
+                    borrowed: true,
                     innerType: "GVariant",
                     lib: "libgio-2.0.so.0",
                 },
                 value: parameters?.ptr ?? parameters,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: fdList?.ptr ?? fdList,
             },
         ], { type: "undefined" });
@@ -202,7 +209,7 @@ export class DBusMethodInvocation extends GObject.GObject {
         const argTypes = [selfType];
         const returnType = undefined;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], DBusMethodInvocation);
+            const self = getObject(args[0], DBusMethodInvocation);
             return handler(self, ...args.slice(1));
         };
         return call("libgio-2.0.so.0", "g_signal_connect_closure", [

package/dist/generated/gio/dbus-node-info.js

@@ -1,5 +1,5 @@
 import { call, read, write } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import { DBusInterfaceInfo } from "./dbus-interface-info.js";
 export class DBusNodeInfo {
     ptr;
@@ -27,7 +27,12 @@ export class DBusNodeInfo {
                 value: indent,
             },
             {
-                type: { type: "boxed", innerType: "GString", lib: "libgio-2.0.so.0" },
+                type: {
+                    type: "boxed",
+                    borrowed: true,
+                    innerType: "GString",
+                    lib: "libgio-2.0.so.0",
+                },
                 value: stringBuilder?.ptr ?? stringBuilder,
             },
         ], { type: "undefined" });
@@ -50,7 +55,7 @@ export class DBusNodeInfo {
         });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusInterfaceInfo);
+        return getObject(ptr, DBusInterfaceInfo);
     }
     ref() {
         const ptr = call("libgio-2.0.so.0", "g_dbus_node_info_ref", [
@@ -64,7 +69,7 @@ export class DBusNodeInfo {
             innerType: "GDBusNodeInfo",
             lib: "libgio-2.0.so.0",
         });
-        return wrapPtr(ptr, DBusNodeInfo);
+        return getObject(ptr, DBusNodeInfo);
     }
     unref() {
         call("libgio-2.0.so.0", "g_dbus_node_info_unref", [

package/dist/generated/gio/dbus-object-manager-client.js

@@ -1,5 +1,5 @@
 import { call } from "@gtkx/native";
-import { NativeError, wrapPtr } from "@gtkx/ffi";
+import { NativeError, getObject } from "@gtkx/ffi";
 import { DBusConnection } from "./dbus-connection.js";
 import { DBusInterface } from "./dbus-interface.js";
 import { DBusObject } from "./dbus-object.js";
@@ -42,11 +42,11 @@ export class DBusObjectManagerClient extends GObject.GObject {
     static objectManagerClientNewForBusFinish(res) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_for_bus_finish", [
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: res?.ptr ?? res,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusObjectManagerClient);
+        return getObject(ptr, DBusObjectManagerClient);
     }
     static objectManagerClientNewForBusSync(busType, flags, name, objectPath, getProxyTypeFunc, getProxyTypeUserData, getProxyTypeDestroyNotify, cancellable) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_for_bus_sync", [
@@ -79,16 +79,16 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: getProxyTypeDestroyNotify,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusObjectManagerClient);
+        return getObject(ptr, DBusObjectManagerClient);
     }
     static objectManagerClientNewSync(connection, flags, objectPath, name, getProxyTypeFunc, getProxyTypeUserData, getProxyTypeDestroyNotify, cancellable) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_sync", [
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
             {
@@ -116,17 +116,17 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: getProxyTypeDestroyNotify,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
         ], { type: "gobject", borrowed: false });
-        return wrapPtr(ptr, DBusObjectManagerClient);
+        return getObject(ptr, DBusObjectManagerClient);
     }
     createPtr(args) {
         const [res] = args;
         return call("libgio-2.0.so.0", "g_dbus_object_manager_client_new_finish", [
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: res?.ptr ?? res,
             },
         ], { type: "gobject", borrowed: false });
@@ -134,7 +134,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
     static _new(connection, flags, name, objectPath, getProxyTypeFunc, getProxyTypeUserData, getProxyTypeDestroyNotify, cancellable, callback, userData) {
         call("libgio-2.0.so.0", "g_dbus_object_manager_client_new", [
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: connection?.ptr ?? connection,
             },
             {
@@ -162,7 +162,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: getProxyTypeDestroyNotify,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
             {
@@ -206,7 +206,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: getProxyTypeDestroyNotify,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
             {
@@ -226,7 +226,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        return wrapPtr(ptr, DBusConnection);
+        return getObject(ptr, DBusConnection);
     }
     getFlags() {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_client_get_flags", [
@@ -263,7 +263,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: ioPriority,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
             {
@@ -284,7 +284,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: res?.ptr ?? res,
             },
             {
@@ -312,7 +312,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: res?.ptr ?? res,
             },
             {
@@ -330,7 +330,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return wrapPtr(ptr, GObject.GObject);
+        return getObject(ptr, GObject.GObject);
     }
     getInterface(objectPath, interfaceName) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_interface", [
@@ -349,7 +349,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusInterface);
+        return getObject(ptr, DBusInterface);
     }
     getObject(objectPath) {
         const ptr = call("libgio-2.0.so.0", "g_dbus_object_manager_get_object", [
@@ -364,7 +364,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
         ], { type: "gobject", borrowed: true });
         if (ptr === null)
             return null;
-        return wrapPtr(ptr, DBusObject);
+        return getObject(ptr, DBusObject);
     }
     getObjectPath() {
         return call("libgio-2.0.so.0", "g_dbus_object_manager_get_object_path", [
@@ -386,7 +386,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
             listType: "glist",
             borrowed: true,
         });
-        return ptrs.map((ptr) => wrapPtr(ptr, DBusObject));
+        return ptrs.map((ptr) => getObject(ptr, DBusObject));
     }
     init(cancellable) {
         const error = { value: null };
@@ -396,7 +396,7 @@ export class DBusObjectManagerClient extends GObject.GObject {
                 value: this.ptr,
             },
             {
-                type: { type: "gobject" },
+                type: { type: "gobject", borrowed: true },
                 value: cancellable?.ptr ?? cancellable,
             },
             {
@@ -424,13 +424,13 @@ export class DBusObjectManagerClient extends GObject.GObject {
             : [selfType];
         const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
-            const self = wrapPtr(args[0], DBusObjectManagerClient);
+            const self = getObject(args[0], DBusObjectManagerClient);
             const signalArgs = args.slice(1);
             if (!meta)
                 return handler(self, ...signalArgs);
             const wrapped = meta.params.map((m, i) => {
                 if (m.getCls && signalArgs[i] != null) {
-                    return wrapPtr(signalArgs[i], m.getCls());
+                    return getObject(signalArgs[i], m.getCls());
                 }
                 return signalArgs[i];
             });