gir_ffi 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a0a971b16d81d55e25b0944aaaf1ae8c28e8546a416b699902e7f254e5ae79d
-  data.tar.gz: 5ef09a4c0f0e2f3fbf9afc7c0de7878fa9e44e65a4808a5f0489119139dcc8b7
+  metadata.gz: 6c0e4b67ec7da9640bab9e8ad5b6af3a21ca34f7f3bb28bc471418952e361325
+  data.tar.gz: 6f86337879c11b41bb57ced5b367dee0785739afc4761203e34140b9fbb8b561
 SHA512:
-  metadata.gz: 35c6e4c0d8f99d790685fc7c4f3a7ad1dcd602696b204c52dc837cc361c7843e0b57887f06e3aca96c55d75e651dac26add7c677d01ddbe3ae275e91615c84fd
-  data.tar.gz: a516176df5475cdc56995c20c84f50bc906e9c3c299c577d3354d9059db07b1deb412a1902c9ca1bc07f43849524a5b93c3659fc6489e172b5b8f24f03aba4c2
+  metadata.gz: 931112391d502613f9c1ec82db244ab0dcf26c56a8a45aca3b9b272f6840a07757c1f6b47bbeebb3f2c57902ac2b30edca379ac991f2744cee2587fd69e07a2f
+  data.tar.gz: 34624b92c7c209aa9a8dd8e6a95e6a378831f39ac0b7af8ac728e9a9cfbf1cd3dc032021d5ae75da797691436123ef382648de5d5df859417c8b55c055d41d83

data/Changelog.md

@@ -1,9 +1,37 @@
 # Changelog
 
+## 0.19.0 / 2026-05-02
+
+* Allow specifying signals as symbols ([#382] by [mvz])
+* Support Ruby 3.2 through 4.0, dropping support for Ruby 3.1
+  ([#383] and [#390] by [mvz])
+* Handle uninitialized Boxed out parameter ([#396] by [mvz])
+* Handle fixed size arrays of GStrv ([#403] by [mvz])
+* Return nil when wrapping a null pointer with GStrv ([#404] by [mvz])
+* Handle zero-terminated arrays of GStrv ([#405] by [mvz])
+* Read elements of GStrv as UTF8 strings ([#406] by [mvz])
+* Handle null GValue return values and out parameters ([#407] by [mvz])
+* Support vfuncs returning a value of type flags ([#412] by [mvz])
+* Block reading of write-only properties ([#413] by [mvz])
+* Ensure class structs are initialized ([#415] by [mvz])
+
+[#382]: https://github.com/mvz/gir_ffi/pull/382
+[#383]: https://github.com/mvz/gir_ffi/pull/383
+[#390]: https://github.com/mvz/gir_ffi/pull/390
+[#396]: https://github.com/mvz/gir_ffi/pull/396
+[#403]: https://github.com/mvz/gir_ffi/pull/403
+[#404]: https://github.com/mvz/gir_ffi/pull/404
+[#405]: https://github.com/mvz/gir_ffi/pull/405
+[#406]: https://github.com/mvz/gir_ffi/pull/406
+[#407]: https://github.com/mvz/gir_ffi/pull/407
+[#412]: https://github.com/mvz/gir_ffi/pull/412
+[#413]: https://github.com/mvz/gir_ffi/pull/413
+[#415]: https://github.com/mvz/gir_ffi/pull/415
+
 ## 0.18.0 / 2025-02-07
 
 * Update contribution guidelines ([#360] by [mvz])
-* Support Ruby 3.1 through 3.4, dripping support for Ruby 3.0 ([#366] by [mvz])
+* Support Ruby 3.1 through 3.4, dropping support for Ruby 3.0 ([#366] by [mvz])
 * Load gobject-2.0 library in a way that does not require the dev package
   ([#367] by [mvz])
 * Update tests for compatibility with GObjectIntrospection 1.81.2 ([#378] by [mvz])
@@ -201,16 +229,16 @@
 ## 0.10.1 / 2016-03-28
 
 * Restore JRuby compatibility.
-  - Introduce #owned to flag unions and structs for release at garbage collection time.
-    In JRuby's implementation, FFI::Pointer does not implement #autorelease=
-    and #autorelease?, so this different technique is used to free pointers
-    allocated by GLib. It is in fact doubtful that setting autorelease had any
-    actual effect even on CRuby.
-  - Immediately free string pointers whose ownership is transfered. Again, the
-    #autorelease technique doesn't work on JRuby.
-  - Fix handling of callee-allocated out parameters in vfuncs. The `put_pointer`
-    method was wrongly called, and JRuby is more picky about what types that
-    method expects, exposing the bug.
+   * Introduce `#owned` to flag unions and structs for release at garbage
+     collection time. In JRuby's implementation, FFI::Pointer does not
+     implement `#autorelease=` and `#autorelease?`, so this different technique
+     is used to free pointers allocated by GLib. It is in fact doubtful that
+     setting autorelease had any actual effect even on CRuby.
+   * Immediately free string pointers whose ownership is transfered. Again, the
+     #autorelease technique doesn't work on JRuby.
+   * Fix handling of callee-allocated out parameters in vfuncs. The `put_pointer`
+     method was wrongly called, and JRuby is more picky about what types that
+     method expects, exposing the bug.
 
 ## 0.10.0 / 2016-03-23
 
@@ -283,16 +311,16 @@
 ## 0.8.6 / 2015-12-09
 
 * Change handling of initializers in subclasses
-  * Subclasses with their own GType revert to the default GObject constructor
-  * Subclasses cannot use their parent classes' non-default contructors
+   * Subclasses with their own GType revert to the default GObject constructor
+   * Subclasses cannot use their parent classes' non-default contructors
 * Find signals in ancestor classes of unintrospectable types
 
 ## 0.8.5 / 2015-12-04
 
 * Improve GObject::Value
-  * Make `#wrap_ruby_value` work for object classes
-  * Use non-deprecated methods for getting and setting char values
-  * Make `set_value` and `get_value` work for interface types
+   * Make `#wrap_ruby_value` work for object classes
+   * Use non-deprecated methods for getting and setting char values
+   * Make `set_value` and `get_value` work for interface types
 
 ## 0.8.4 / 2015-12-03
 
@@ -312,14 +340,14 @@
 
 * Use inherited constructor for boxed types
 * Make `InOutPointer` work correctly for boxed types
-  * Make `.for` work with boxed types
-  * Make `#set_value` work with boxed types
+   * Make `.for` work with boxed types
+   * Make `#set_value` work with boxed types
 * Make GObject::Value support nil type:
-  * Make `.wrap_ruby_value(nil)` work
-  * Make `#set_value` and `#get_value` work when the type is `TYPE_INVALID`
-  * Make `.for_gtype` work with `TYPE_INVALID` and `TYPE_NONE`
-  * Make `.from(nil)` return a `GObject::Value` instead of nil
-  * Make `#set_ruby_value` private
+   * Make `.wrap_ruby_value(nil)` work
+   * Make `#set_value` and `#get_value` work when the type is `TYPE_INVALID`
+   * Make `.for_gtype` work with `TYPE_INVALID` and `TYPE_NONE`
+   * Make `.from(nil)` return a `GObject::Value` instead of nil
+   * Make `#set_ruby_value` private
 * Make `GObject::Object.signal_emit` work with gobject-introspection 1.46
 * Replace or remove all custom `.new` methods
 * Make `setup_method` and `setup_instance_method` handle symbol arguments
@@ -386,8 +414,8 @@
 * Provide constant `TYPE_BYTE_ARRAY`
 * Don't recurse looking for signals and properties
 * Clean up generated code:
-  * Avoid use of an ignored dummy argument
-  * Clean up trailing whitespace
+   * Avoid use of an ignored dummy argument
+   * Clean up trailing whitespace
 * Drop support for Ruby 1.9.2
 * Allow data argument for `GObject::Object#signal_connect`
 * Let Ruby threads run during GLib's main loop
@@ -432,25 +460,25 @@
 ## 0.7.0 / 2014-01-11
 
 * Type handling:
-  * Handle c arrays with separate length argument for signals
-  * Handle GHashTable values of type `:gint8` and `:guint32`
-  * Handle signals with int64, Strv, uint64 arguments
-  * Handle arrays of integers cast as pointers
-  * Handle fields of callback type
-  * Handle nested GHashTable
+   * Handle c arrays with separate length argument for signals
+   * Handle GHashTable values of type `:gint8` and `:guint32`
+   * Handle signals with int64, Strv, uint64 arguments
+   * Handle arrays of integers cast as pointers
+   * Handle fields of callback type
+   * Handle nested GHashTable
 * Argument handling:
-  * Refactor argument builder system
-  * Improve handling of user data arguments
-  * Handle signal and callback arguments with direction :out
-  * Handle aliases of container types by making the element type optional
-  * Handle signal and callback return values that need conversion
+   * Refactor argument builder system
+   * Improve handling of user data arguments
+   * Handle signal and callback arguments with direction :out
+   * Handle aliases of container types by making the element type optional
+   * Handle signal and callback return values that need conversion
 * User defined types:
-  * Pass explicit receiver to initialization block for UserDefinedTypeInfo
-  * Allow user defined types that are anonymous Ruby classes
-  * Register defined properties in a subclass
-  * Support setting virtual function implementations in a subclass
-  * Support adding an interface to a subclass
-  * Support implementing an interface's virtual functions in a subclass
+   * Pass explicit receiver to initialization block for UserDefinedTypeInfo
+   * Allow user defined types that are anonymous Ruby classes
+   * Register defined properties in a subclass
+   * Support setting virtual function implementations in a subclass
+   * Support adding an interface to a subclass
+   * Support implementing an interface's virtual functions in a subclass
 * Use FFI's DataConvertor system to handle enums and callbacks
 * Stop using deprecated GValueArray to construct argument array for `signal_emit`
 * Make `ITypeInfo#g_type` return correct value for c arrays
@@ -601,13 +629,13 @@
 
 * Add support for properties, with `#get_property` and `#set_property`.
 * Add support for fields.
-  - Create field accessor methods.
-  - Get rid of `#[]` and `#[]=`.
+   * Create field accessor methods.
+   * Get rid of `#[]` and `#[]=`.
 * Explicitely load `libgirepository` with ABI version 1.
 * Improve implementation of GLib container classes (GList etc.):
-  - Real constructors.
-  - `#append` and friends are instance methods now.
-  - Conversion methods to cast Ruby containers to GLib containers.
+   * Real constructors.
+   * `#append` and friends are instance methods now.
+   * Conversion methods to cast Ruby containers to GLib containers.
 * Start implementing pretty printing.
 * Various refactorings.
 
@@ -620,10 +648,10 @@
 ## 0.0.14 / 2011-10-28
 
 * Support GObject Introspection version 1.30:
-  - Add support for layouts with fixed-length arrays.
-  - Handle type names starting with underscores.
-  - Call `g_signal_emitv` directly to avoid conflict in introspection info
-    with earlier versions of GObject Introspection.
+   * Add support for layouts with fixed-length arrays.
+   * Handle type names starting with underscores.
+   * Call `g_signal_emitv` directly to avoid conflict in introspection info
+     with earlier versions of GObject Introspection.
 
 ## 0.0.13 / 2011-09-09
 
@@ -675,8 +703,8 @@
 ## 0.0.7 / 2011-04-01
 
 * Support gobject-introspection 0.10, drop support for earlier versions.
-  - Use Regress, not Everything, for testing.
-  - Deal with functions that are no longer introspectable.
+   * Use Regress, not Everything, for testing.
+   * Deal with functions that are no longer introspectable.
 * Correctly handle constructors that declare their return type different
   from their class.
 * Implement `RubyClosure`, a `GObject::Closure` for handling ruby callbacks.

data/README.md

@@ -57,7 +57,7 @@ gem install gir_ffi
 
 ## Requirements
 
-GirFFI is supported on CRuby 2.7, 3.0 and 3.1.
+GirFFI is supported on CRuby 3.2 through 4.0.
 
 You will also need gobject-introspection installed with some
 introspection data.

data/TODO.md

@@ -3,12 +3,14 @@
 ## Memory managment
 
 GirFFI does not ~~attempt to free any memory at the moment, or~~ lower the
-reference count of any objects it gets from GObject. This task therefore involves two parts:
+reference count of any objects it gets from GObject. This task therefore
+involves two parts:
 
 - Free non-GObject pointers as needed (at garbage-collection time)
 - [Done!] Lower reference count of GObjects (at garbage-collection time)
 
-**Use memory_profiler to check memory use (https://github.com/SamSaffron/memory_profiler)**
+**Use [memory_profiler](https://github.com/SamSaffron/memory_profiler) to check
+memory use**
 
 ## Refactorings
 
@@ -28,33 +30,35 @@ These in the order they occured to me, and may therefore be fixed in any order.
 
 Derived classes are now registered like so:
 
-    class Derived < Base
-      install_property GObject.param_spec_int("foo", "foo bar",
-                                              "The Foo Bar Property",
-                                               10, 20, 15, 3)
+```ruby
+class Derived < Base
+  install_property GObject.param_spec_int("foo", "foo bar",
+                                          "The Foo Bar Property",
+                                           10, 20, 15, 3)
 
-      # assume Base defines a virtual function called 'some_vfunc'
-      install_vfunc_implementation :some_vfunc, proc {|obj|
-        # implementation goes here
-      }
+  # assume Base defines a virtual function called 'some_vfunc'
+  install_vfunc_implementation :some_vfunc, proc {|obj|
+    # implementation goes here
+  }
 
-      def other_vfunc
-        # implementation
-      end
+  def other_vfunc
+    # implementation
+  end
 
-      # assume Base defines a virtual function called 'other_vfunc'
-      install_vfunc_implementation :other_vfunc
-    end
+  # assume Base defines a virtual function called 'other_vfunc'
+  install_vfunc_implementation :other_vfunc
+end
 
-    GirFFI.define_type Derived
+GirFFI.define_type Derived
+```
 
 Potential improvements:
 
-* Allow `define_type` to be called in the class definition
-* Perhaps auto-register types, like Gtk# does
-* Perhaps automagically find vfunc implementations, like PyGObject and
+- Allow `define_type` to be called in the class definition
+- Perhaps auto-register types, like Gtk# does
+- Perhaps automagically find vfunc implementations, like PyGObject and
   Ruby-GNOME do
-* What about properties?
+- What about properties?
 
 NOTE: When adding an interface module to a derived class, its prerequisites
 should be checked.
@@ -65,7 +69,7 @@ GirFFI should make sure that if it gets a pointer to a GObject for which a Ruby
 object already exists, the existing object is returned. This involves the use
 of WeakRef, no doubt.
 
-## Handle fundamental objects that are not GObject.
+## Handle fundamental objects that are not GObject
 
 This is a big one. See commit 1e9822c7817062a9b853269b9418fd78782090b5 in
 gobject-introspection, and TestFundamentalObject in Regress.
@@ -73,12 +77,16 @@ gobject-introspection, and TestFundamentalObject in Regress.
 The tests for TestFundamentalObject accidentally pass, but there may be
 hidden issues.
 
-## Check binding of GObject:
+## Check binding of GObject
 
-    (11:37:03 PM) walters: the basic story is that GObject should be manually bound
-    (11:47:02 PM) ebassi: the really necessary bits are: GObject/GInitiallyUnowned memory management; properties accessors; GSignal connection API
-    (11:47:15 PM) ebassi: the rest is "nice to have"
-    (11:47:37 PM) ebassi: oh, and probably GBinding - but that's just because I wrote it ;-)
+```
+(11:37:03 PM) walters: the basic story is that GObject should be manually bound
+(11:47:02 PM) ebassi: the really necessary bits are: GObject/GInitiallyUnowned
+    memory management; properties accessors; GSignal connection API
+(11:47:15 PM) ebassi: the rest is "nice to have"
+(11:47:37 PM) ebassi: oh, and probably GBinding - but that's just because I
+    wrote it ;-)
+```
 
 ## Use FFI::DataConverter to automatically convert GObject types
 
@@ -96,20 +104,20 @@ to be put in place for that.
 
 ## Handle ownership-transfer correctly
 
-For how to handle objects, see https://bugzilla.gnome.org/show_bug.cgi?id=657202#c1
+For how to handle objects, see [this comment on Gnome bug 657202](https://bugzilla.gnome.org/show_bug.cgi?id=657202#c1).
 
 ## Miscellaneous
 
-* Move GObjectIntrospection to GIRepository, and allow generating its own
+- Move GObjectIntrospection to GIRepository, and allow generating its own
   members.
-* Do something useful with the versioning info in the GIR
+- Do something useful with the versioning info in the GIR
 
 ## External dependencies
 
 Things that I think GirFFI cannot fix:
 
-* gobject-introspection should correctly mark private fields as not readable.
-* gobject-introspection should ignore functions that are only defined but not
+- gobject-introspection should correctly mark private fields as not readable.
+- gobject-introspection should ignore functions that are only defined but not
   implemented, or implement those cases in GIMarshallingTests.
 
 ## See Also

data/lib/ffi-glib/array.rb

@@ -22,7 +22,7 @@ module GLib
 
     # @api private
     def self.from_enumerable(elmtype, arr)
-      new(elmtype).tap { |it| it.append_vals arr }
+      new(elmtype).tap { _1.append_vals arr }
     end
 
     # @api private

data/lib/ffi-glib/destroy_notify.rb

@@ -7,6 +7,14 @@ module GLib
   # It should not be necessary to create objects of this class from Ruby
   # directly.
   class DestroyNotify
+    # Return the default DestroyNotify object used when calling functions that
+    # take a DestroyNotify argument.
+    #
+    # GirFFI uses a singleton object here to ensure it will always exist when
+    # called from the C side.
+    #
+    # This assumes ClosureToPointerConvertor creates code store the callbacak
+    # to be destroyed using ArgHelper.store.
     def self.default
       @default ||= from proc { |user_data|
         callback = GirFFI::ArgHelper::OBJECT_STORE.fetch(user_data)

data/lib/ffi-glib/list_methods.rb

@@ -6,6 +6,7 @@ module GLib
   # Common methods for List and SList.
   module ListMethods
     include Enumerable
+
     attr_reader :element_type
 
     def self.included(base)

data/lib/ffi-glib/ptr_array.rb

@@ -27,7 +27,7 @@ module GLib
     end
 
     def self.from_enumerable(type, arr)
-      new(type).tap { |it| it.add_array arr }
+      new(type).tap { _1.add_array arr }
     end
 
     def self.add(array, data)

data/lib/ffi-gobject/object.rb

@@ -124,7 +124,12 @@ module GObject
     # Overrides for GObject, GObject's generic base class.
     module Overrides
       def get_property(property_name)
-        gvalue = gvalue_for_property property_name
+        spec = property_param_spec(property_name)
+        unless spec.flags[:readable]
+          raise ArgumentError, "Property #{property_name} is not readable"
+        end
+
+        gvalue = GObject::Value.for_gtype spec.value_type
         super property_name, gvalue
         value = gvalue.get_value
 

data/lib/ffi-gobject/ruby_closure.rb

@@ -41,8 +41,8 @@ module GObject
 
     # @api private
     # TODO: Re-structure so invoke_block can become a private method
-    def invoke_block(*args)
-      block.call(*args)
+    def invoke_block(*)
+      block.call(*)
     end
 
     private

data/lib/ffi-gobject/value.rb

@@ -48,16 +48,16 @@ module GObject
     end
 
     def self.for_gtype(gtype)
-      new.tap do |it|
-        it.init gtype
+      new.tap do |val|
+        val.init gtype
       end
     end
 
     # TODO: Combine with wrap_ruby_value
     def self.wrap_instance(instance)
-      new.tap do |it|
-        it.init GObject.type_from_instance instance
-        it.set_instance instance
+      new.tap do |val|
+        val.init GObject.type_from_instance instance
+        val.set_instance instance
       end
     end
 

data/lib/ffi-gobject.rb

@@ -36,11 +36,12 @@ module GObject
   end
 
   def self.signal_emit(object, detailed_signal, *args)
-    signal, detail = detailed_signal.split("::")
-    signal_id = signal_lookup_from_instance signal, object
+    _, signal_name, detail = process_detailed_signal detailed_signal
+
+    signal_id = signal_lookup_from_instance signal_name, object
     detail_quark = GLib.quark_from_string(detail)
 
-    sig_info = object.class.find_signal signal
+    sig_info = object.class.find_signal signal_name
     argument_gvalues = sig_info.arguments_to_gvalues object, args
     return_gvalue = sig_info.gvalue_for_return_value
 
@@ -50,9 +51,9 @@ module GObject
   def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
     block or raise ArgumentError, "Block needed"
 
-    signal_name, = detailed_signal.split("::")
-    sig_info = object.class.find_signal signal_name
+    detailed_signal, signal_name, = process_detailed_signal detailed_signal
 
+    sig_info = object.class.find_signal signal_name
     closure = sig_info.wrap_in_closure do |*args|
       yield(*args << data)
     end
@@ -64,6 +65,16 @@ module GObject
     signal_connect(object, detailed_signal, data, true, &)
   end
 
+  class << self
+    private
+
+    def process_detailed_signal(detailed_signal)
+      detailed_signal = detailed_signal.to_s.tr("_", "-") if detailed_signal.is_a?(Symbol)
+      signal_name, detail = detailed_signal.split("::")
+      return detailed_signal, signal_name, detail
+    end
+  end
+
   load_class :Callback
   load_class :ClosureNotify
   load_class :ConnectFlags

data/lib/ffi-gobject_introspection/gobject_type_init.rb

@@ -12,6 +12,7 @@ module GObjectIntrospection
     # Module for attaching g_type_init from the gobject library.
     module Lib
       extend FFI::Library
+
       ffi_lib "gobject-2.0.so.0"
       attach_function :g_type_init, [], :void
     end

data/lib/ffi-gobject_introspection/lib.rb

@@ -8,6 +8,7 @@ module GObjectIntrospection
   module Lib
     extend FFI::Library
     extend FFI::BitMasks
+
     ffi_lib "girepository-1.0.so.1"
 
     # IRepository

data/lib/ffi-gobject_introspection/strv.rb

@@ -4,8 +4,9 @@ require "ffi"
 
 module GObjectIntrospection
   # Represents a null-terminated array of strings.
-  # GLib uses this
-  # construction, but does not provide any actual functions for this class.
+  # GLib uses this construction, but does not provide any actual functions for
+  # this class.
+  # In a sense, this is a specialization of GirFFI::ZeroTerminated.
   class Strv
     include Enumerable
 
@@ -23,12 +24,12 @@ module GObjectIntrospection
       offset = 0
       while (ptr = fetch_ptr offset)
         offset += POINTER_SIZE
-        yield ptr.read_string
+        yield ptr.read_string.force_encoding(Encoding::UTF_8)
       end
     end
 
     def self.wrap(ptr)
-      new ptr
+      new ptr unless ptr.null?
     end
 
     private

data/lib/gir_ffi/array_element_convertor.rb

@@ -17,7 +17,9 @@ module GirFFI
       when :utf8, :filename
         bare_value.to_utf8
       when Array
-        value_type[1].wrap bare_value
+        element_type = value_type[1]
+        element_type = GLib::Strv if element_type == :strv
+        element_type.wrap bare_value
       when Module
         value_type.wrap bare_value
       else

data/lib/gir_ffi/boolean.rb

@@ -6,17 +6,19 @@ module GirFFI
   # Class representing a boolean (natively, an int).
   class Boolean
     extend FFI::DataConverter
+
     native_type FFI::Type::INT
 
-    FROM_NATIVE = { 0 => false, 1 => true }.freeze
-    TO_NATIVE = FROM_NATIVE.invert
+    NATIVE_TRUE = 1
+    NATIVE_FALSE = 0
+    FROM_NATIVE = { NATIVE_FALSE => false, NATIVE_TRUE => true }.freeze
 
     def self.from_native(value, _context)
       FROM_NATIVE.fetch(value)
     end
 
     def self.to_native(value, _context)
-      TO_NATIVE.fetch(value ? true : false)
+      value ? NATIVE_TRUE : NATIVE_FALSE
     end
 
     def self.size

data/lib/gir_ffi/boxed_base.rb

@@ -10,6 +10,8 @@ module GirFFI
     end
 
     def self.copy(val)
+      return if val.to_ptr.null?
+
       ptr = GObject.boxed_copy(gtype, val)
       wrap(ptr)
     end

data/lib/gir_ffi/builders/argument_builder.rb

@@ -114,7 +114,7 @@ module GirFFI
 
       def outgoing_convertor(base)
         FullCToRubyConvertor.new(type_info, base, length_argument_name,
-                                 ownership_transfer: arginfo.ownership_transfer)
+                                 ownership_transfer: ownership_transfer)
       end
 
       def sub_type_spec
@@ -203,13 +203,11 @@ module GirFFI
           arginfo.caller_allocates?
       end
 
-      DESTROY_NOTIFIER = "GLib::DestroyNotify.default"
-
       def ingoing_convertor
         if skipped_in?
           NullConvertor.new("0")
         elsif destroy_notifier?
-          NullConvertor.new(DESTROY_NOTIFIER)
+          NullConvertor.new("GLib::DestroyNotify.default")
         elsif user_data?
           ClosureToPointerConvertor.new(callback_argument_name)
         elsif needs_ruby_to_c_conversion?

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -150,9 +150,9 @@ module GirFFI
 
       def base_argument_names(arguments)
         required_found = false
-        arguments.reverse.filter_map do |it|
-          name = it.method_argument_name
-          if it.allow_none? && !required_found
+        arguments.reverse.filter_map do |arg|
+          name = arg.method_argument_name
+          if arg.allow_none? && !required_found
             "#{name} = nil"
           else
             required_found = true

data/lib/gir_ffi/builders/closure_to_pointer_convertor.rb

@@ -4,6 +4,9 @@ module GirFFI
   module Builders
     # Builder that generates code to convert closure arguments ('user data')
     # from Ruby to C. Used by argument builders.
+    #
+    # GirFFI uses this to store a key to the storage of the related callback so
+    # it can be cleaned by the default DestroyNotify object.
     class ClosureToPointerConvertor
       def initialize(argument_name)
         @argument_name = argument_name