allow transfer=none for GLists and GSLists

Author: jwahlstrand

GI/src/giimport.jl

@@ -762,11 +762,15 @@ function extract_type(typeinfo::GITypeInfo,listtype::Type{T}) where {T<:GLib._LL
     TypeDesc{Type{GList}}(GList, :(GLib.LList{$lt{$elmtype}}),:(GLib.LList{$lt{$elmtype}}), :(Ptr{$lt{$elmtype}}))
 end
 function convert_from_c(name::Symbol, arginfo::ArgInfo, typeinfo::TypeDesc{Type{GList}})
-    owns = (get_ownership_transfer(arginfo) == GITransfer.EVERYTHING)
-    if get_ownership_transfer(arginfo) == GITransfer.NOTHING
-          nothing  # just return the pointer
+    ot = get_ownership_transfer(arginfo)
+    if ot == GITransfer.NOTHING
+        :( GLib.GList($name, false, false) )
+    elseif ot == GITransfer.CONTAINER
+        :( GLib.GList($name, false) )
+    elseif ot == GITransfer.EVERYTHING
+        :( GLib.GList($name, true) )
     else
-        :( GLib.GList($name, $owns) )
+        error("Unknown transfer type for GList")
     end
 end
 

src/GLib/glist.jl

@@ -1,4 +1,4 @@
-# Gtk linked list
+# GLib linked list
 
 ## Type hierarchy information
 
@@ -21,19 +21,21 @@ eltype(::Type{L}) where {L <: _LList} = eltype(supertype(L))
 mutable struct GList{L <: _LList, T} <: AbstractVector{T}
     handle::Ptr{L}
     transfer_full::Bool
-    function GList{L,T}(handle, transfer_full::Bool) where {L<:_LList,T}
-        # if transfer_full == true, then also free the elements when finalizing the list
+    transfer_container::Bool
+    function GList{L,T}(handle, transfer_elements::Bool, transfer_container::Bool=true) where {L<:_LList,T}
+        # if transfer_elements == true, then also free the elements when finalizing the list
+        # if transfer_container == false, then do not call `g_list_free` when emptying
         # this function assumes the caller will take care of holding a pointer to the returned object
         # until it wants to be garbage collected
         @assert T == eltype(L)
-        l = new{L,T}(handle, transfer_full)
+        l = new{L,T}(handle, transfer_elements, transfer_container)
         finalizer(empty!, l)
         return l
     end
 end
 GList(list::Type{T}) where {T} = GList(convert(Ptr{_GList{T}}, C_NULL), true)
 GSList(list::Type{T}) where {T} = GList(convert(Ptr{_GSList{T}}, C_NULL), true)
-GList(list::Ptr{L}, transfer_full::Bool = false) where {L <: _LList} = GList{L, eltype(L)}(list, transfer_full)
+GList(list::Ptr{L}, transfer_full::Bool = false, transfer_container::Bool = true) where {L <: _LList} = GList{L, eltype(L)}(list, transfer_full, transfer_container)
 
 const  LList{L <: _LList} = Union{Ptr{L}, GList{L}}
 eltype(::LList{L}) where {L <: _LList} = eltype(L)
@@ -132,7 +134,9 @@ function empty!(list::GList{L}) where L <: _GSList
                 s = next_(list, s)[2]
             end
         end
-        #ccall((:g_slist_free, libglib), Nothing, (Ptr{L},), list)
+        if list.transfer_container
+            ccall((:g_slist_free, libglib), Nothing, (Ptr{L},), list)
+        end
         list.handle = C_NULL
     end
     return list
@@ -146,7 +150,9 @@ function empty!(list::GList{L}) where L <: _GList
                 s = next_(list, s)[2]
             end
         end
-        ccall((:g_list_free, libglib), Nothing, (Ptr{L},), list)
+        if list.transfer_container
+            ccall((:g_list_free, libglib), Nothing, (Ptr{L},), list)
+        end
         list.handle = C_NULL
     end
     return list

src/gen/gio_methods

@@ -2020,7 +2020,8 @@ $(Expr(:toplevel, quote
     end
     function get_emblems(instance::GEmblemedIcon)
         ret = ccall(("g_emblemed_icon_get_emblems", libgio), Ptr{GLib._GList{Ptr{GObject}}}, (Ptr{GObject},), instance)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function get_icon(instance::GEmblemedIcon)
         ret = ccall(("g_emblemed_icon_get_icon", libgio), Ptr{GObject}, (Ptr{GObject},), instance)

src/gen/gtk4_methods

@@ -1311,7 +1311,8 @@ $(Expr(:toplevel, quote
     end
     function get_windows(instance::GtkApplication)
         ret = ccall(("gtk_application_get_windows", libgtk4), Ptr{GLib._GList{Ptr{GObject}}}, (Ptr{GObject},), instance)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function inhibit(instance::GtkApplication, _window::Maybe(GtkWindow), _flags, _reason::Maybe(Union{AbstractString, Symbol}))
         _window_maybe = nothing_to_null(_window)
@@ -1400,6 +1401,9 @@ $(Expr(:toplevel, quote
     function remove_action(instance::GtkApplication, _action_name::Union{AbstractString, Symbol})
         remove_action(GActionMap(instance), _action_name)
     end
+    function remove_action_entries(instance::GtkApplication, _entries)
+        remove_action_entries(GActionMap(instance), _entries)
+    end
     function ApplicationWindow_new(_application::GtkApplication)
         ret = ccall(("gtk_application_window_new", libgtk4), Ptr{GObject}, (Ptr{GObject},), _application)
         ret2 = GtkApplicationWindowLeaf(ret, false)
@@ -1482,6 +1486,9 @@ $(Expr(:toplevel, quote
     function remove_action(instance::GtkApplicationWindow, _action_name::Union{AbstractString, Symbol})
         remove_action(GActionMap(instance), _action_name)
     end
+    function remove_action_entries(instance::GtkApplicationWindow, _entries)
+        remove_action_entries(GActionMap(instance), _entries)
+    end
     function get_accessible_parent(instance::GtkApplicationWindow)
         get_accessible_parent(GtkAccessible(instance))
     end
@@ -2569,7 +2576,8 @@ $(Expr(:toplevel, quote
     end
     function get_focus_siblings(instance::GtkCellArea, _renderer::GtkCellRenderer)
         ret = ccall(("gtk_cell_area_get_focus_siblings", libgtk4), Ptr{GLib._GList{Ptr{GObject}}}, (Ptr{GObject}, Ptr{GObject}), instance, _renderer)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function get_preferred_height(instance::GtkCellArea, _context::GtkCellAreaContext, _widget::GtkWidget)
         m_minimum_height = Ref{Int32}()
@@ -15856,7 +15864,8 @@ $(Expr(:toplevel, quote
     end
     function get_widgets(instance::GtkSizeGroup)
         ret = ccall(("gtk_size_group_get_widgets", libgtk4), Ptr{GLib._GSList{Ptr{GObject}}}, (Ptr{GObject},), instance)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function remove_widget(instance::GtkSizeGroup, _widget::GtkWidget)
         ret = ccall(("gtk_size_group_remove_widget", libgtk4), Nothing, (Ptr{GObject}, Ptr{GObject}), instance, _widget)

src/gen/pango_consts

@@ -11,9 +11,9 @@ $(Expr(:toplevel, quote
         const GLYPH_UNKNOWN_FLAG = 0x10000000
         const SCALE = 1024
         const VERSION_MAJOR = 1
-        const VERSION_MICRO = 0
-        const VERSION_MINOR = 51
-        const VERSION_STRING = "1.51.0"
+        const VERSION_MICRO = 14
+        const VERSION_MINOR = 50
+        const VERSION_STRING = "1.50.14"
         begin
             @cenum Alignment::Int32 Alignment_LEFT = 0 Alignment_CENTER = 1 Alignment_RIGHT = 2
             (GLib.g_type(::Type{T}) where T <: Alignment) = begin

src/gen/pango_methods

@@ -1445,11 +1445,13 @@ $(Expr(:toplevel, quote
     end
     function get_lines(instance::PangoLayout)
         ret = ccall(("pango_layout_get_lines", libpango), Ptr{GLib._GSList{_PangoLayoutLine}}, (Ptr{GObject},), instance)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function get_lines_readonly(instance::PangoLayout)
         ret = ccall(("pango_layout_get_lines_readonly", libpango), Ptr{GLib._GSList{_PangoLayoutLine}}, (Ptr{GObject},), instance)
-        ret
+        ret2 = GLib.GList(ret, false, false)
+        ret2
     end
     function get_log_attrs(instance::PangoLayout)
         m_attrs = Ref{Ptr{_PangoLogAttr}}()

test/gui/misc.jl

@@ -160,11 +160,13 @@ push!(b4; filename="test.ui")
 win = b4["a_window"]
 destroy(win)
 
-b5 = GtkBuilder()
-Sys.WORD_SIZE == 64 && push!(b5; buffer=s)
+if Sys.WORD_SIZE == 64
+    b5 = GtkBuilder()
+    push!(b5; buffer=s)
 
-win = b5["a_window"]
-destroy(win)
+    win = b5["a_window"]
+    destroy(win)
+end
 
 end
 

test/list.jl

@@ -1,4 +1,4 @@
-using Gtk4.GLib
+using Gtk4.GLib, Test
 
 @testset "glist" begin