Upgrade to version 8.0

9e5c8663 · dmknght · b36d7342 · 9e5c8663 · 9e5c8663 · 9e5c8663
Commit 9e5c8663 authored Aug 12, 2020 by dmknght
--- a/debian/changelog
+++ b/debian/changelog
+gintro (0.8.0-parrot0) rolling-testing; urgency=medium
+
+  * Upgrade version to 8.0
+
+ -- Nong Hoang "dmknght" Tu <dmknght@parrotsec.org>  Wed, 12 Aug 2020 18:42:07 +0700
+
 gintro (0.7.9-parrot1) stable; urgency=medium

  * Fix full path after installation

--- a/gintro/gdkx11.nim
+++ b/gintro/gdkx11.nim
@@ -264,7 +264,8 @@ proc gdk_x11_display_string_to_compound_text(self: ptr X11Display00; str: cstrin
    importc, libprag.}

 proc stringToCompoundText*(self: X11Display; str: cstring;
-    encoding: var ptr gdk.Atom00; format: var int; ctext: var seq[uint8]; length: var int): int =
+    encoding: var ptr gdk.Atom00; format: var int; ctext: var (seq[uint8] | string);
+    length: var int): int =
  var length_00 = int32(length)
  var format_00 = int32(format)
  var ctext_00: pointer
@@ -295,7 +296,8 @@ proc gdk_x11_display_utf8_to_compound_text(self: ptr X11Display00; str: cstring;
    importc, libprag.}

 proc utf8ToCompoundText*(self: X11Display; str: cstring;
-    encoding: var ptr gdk.Atom00; format: var int; ctext: var seq[uint8]; length: var int): bool =
+    encoding: var ptr gdk.Atom00; format: var int; ctext: var (seq[uint8] | string);
+    length: var int): bool =
  var length_00 = int32(length)
  var format_00 = int32(format)
  var ctext_00: pointer

--- a/gintro/gimpl.nim
+++ b/gintro/gimpl.nim
-import strutils
+from sequtils import keepItIf
 const RecSep = "!" # Record separator for entries in gisup.nim, also defined in gen.nim

 # caution: $$ due to string interpolation
@@ -98,6 +98,7 @@ proc $1$2 {.cdecl.} =
    r1s.add(")\n")
  else: # signals with multiple arguments and maybe using interface providers
    (sn, wid, num, ahl, all) = sci.split(RecSep)
+    echo "ttt ", ahl
    if ahl.contains("|"): # we have to handle interface providers
      var hargs = ahl.split(";") # handler arguments
      for i in 0 .. hargs.high: # find the position of the providers, should be second or third argument
@@ -129,10 +130,24 @@ proc $1$2 {.cdecl.} =
    if all.find(";") > 0: # more than one argument
      var largs = all.split("; ")
      largs.delete(0)
-      largs[^1] = largs[^1].split(")")[0] 
+      largs[^1] = largs[^1].split(")")[0]
      var names, types: array[10, string]
-      for i in 0 .. largs.high:
-        if largs[i].endsWith("00"):
+      #for i in 0 .. largs.high:
+      var i = 0
+      var largslen = largs.len
+      while i < largslen:
+        if largs[i].endsWith("00Array"):
+          (names[i], types[i]) = largs[i].split(": ")
+          let al = largs[i + 1].split(": ")[0]
+          var h = types[i]
+          h[0] = h[0].toLowerAscii
+          h.add("2seq(" & names[i] & ", " & al & ")")
+          names[i] = h
+          types[i].setLen(0)
+          #largs.del(i + 1) # bug, should be delete!
+          largs.delete(i + 1)
+          dec(largslen)
+        elif largs[i].endsWith("00"):
          (names[i], types[i]) = largs[i].split(": ptr ")
          types[i].setLen(types[i].len - 2)
        else:
@@ -143,6 +158,7 @@ proc $1$2 {.cdecl.} =
          if h.len > 0:
            a1 = h & "(" & a1 & ")"
          names[i] = a1
+        inc(i)
 
      if ipos > 0:
        types[ipos - 1] = ipro
@@ -166,11 +182,17 @@ proc $1$2 {.cdecl.} =
    resu.add(")")
    if resl == "gboolean":
      resu.add(".ord.gboolean")
+
+    if resl == "int32":
+      resu.add(".int32")
+
    r1s.add(resu & "\n")
    all = all.replace(")", "; user_data: pointer)")
  r1s = r1s % [$procNameCdecl, all, $p, wts, ats]
-  # echo r1s
+  #echo r1s
+
  result = parseStmt(r1s)
+
  if not ignoreArg.boolVal:
    ahl = ahl.replace(")", "; arg: " & ats & ")")
  if ahl.find(";") > 0:
@@ -178,29 +200,27 @@ proc $1$2 {.cdecl.} =
  else:
    ahl = "(self: " & wts & ")" & ahl.split(")", 1)[1]

-  let r2sunused =
-    if ignoreArg.boolVal:
-      """
-proc $1(self: $2;  p: proc $3): culong {.discardable.} =
-  sc$4(self, $5, nil)
-$1($6, $7)
-""" % [$procName, wts, ahl, signalName,  $procNameCdecl, $(widget.toStrLit), $p]
-    else:
-      """
-proc $1(self: $2;  p: proc $3; a: $4): culong {.discardable.} =
-  when a is ref:
-    GC_ref(a)
-    sc$5(self, $6, cast[pointer](a))
-  else:
-    var ar: ref $4
-    new(ar)
-    #deepCopy(ar[], a)
-    ar[] = a
-    GC_ref(ar)
-    # sc$5(self, $6, cast[pointer](ar[]))
-    sc$5(self, $6, cast[pointer](ar))
-$1($7, $8, $9)
-""" % [$procName, wts,  ahl, ats, signalName,  $procNameCdecl, $(widget.toStrLit), $p, $(arg.toStrLit)]
+  if ahl.find("00Array") >= 0:
+    var hhh = ahl.split("; ")
+    let l = hhh.len
+    var i = 0
+    while i < l:
+      # files: seq[gio.File]
+      if hhh[i] .find("00Array") >= 0:
+        var a, b: string
+        (a, b) = hhh[i].split(": ")
+        b = b.replace("00Array", "]")
+        #if b == "File]":
+        #  b = "gio.File]"
+        b = "seq[" & b
+        hhh[i] = a & ": " & b
+        hhh[i + 1].setLen(0)
+      inc(i)
+    hhh.keepItIf(it.len > 0)
+    #echo ">>>>>>>>>> ", hhh.join("; ")
+    ahl = hhh.join("; ")
+
+  ahl = ahl.replace(": cstring", ": string")

  # maybe we write this better this way:
  let r2s =
@@ -229,7 +249,8 @@ proc $1(self: $2;  p: proc $3; a: $4): culong {.discardable.} =
  sc$5(self, $6, cast[pointer](ar), $10)
 $1($7, $8, $9)
 """ % [$procName, wts,  ahl, ats, signalName,  $procNameCdecl, $(widget.toStrLit), $p, $(arg.toStrLit), sfstr]
-  # echo r2s
+  #echo r2s
+
  result.add(parseStmt(r2s))

 template connect*(widget: gobject.Object; signal: string; p: typed; arg: typed): untyped =

--- a/gintro/gio.nim
+++ b/gintro/gio.nim
--- a/gintro/gisup3.nim
+++ b/gintro/gisup3.nim
@@ -171,11 +171,11 @@ const
    "move_focus_out!ScrolledWindow!1!(self: ScrolledWindow; directionType: DirectionType)!(self: ptr ScrolledWindow00; directionType: DirectionType)",
    "scroll_child!ScrolledWindow!2!(self: ScrolledWindow; scroll: ScrollType; horizontal: bool): bool!(self: ptr ScrolledWindow00; scroll: ScrollType; horizontal: gboolean): gboolean",
    "drag_action_ask!PlacesSidebar!1!(self: PlacesSidebar; actions: int): int!(self: ptr PlacesSidebar00; actions: int32): int32",
-    "drag_action_requested!PlacesSidebar!3!(self: PlacesSidebar; context: gdk.DragContext; destFile: gio.File; sourceFileList: ptr pointer): int!(self: ptr PlacesSidebar00; context: ptr gdk.DragContext00; destFile: ptr gio.File00; sourceFileList: ptr pointer): int32",
-    "drag_perform_drop!PlacesSidebar!3!(self: PlacesSidebar; destFile: gio.File; sourceFileList: ptr pointer; action: int)!(self: ptr PlacesSidebar00; destFile: ptr gio.File00; sourceFileList: ptr pointer; action: int32)",
+    "drag_action_requested!PlacesSidebar!3!(self: PlacesSidebar; context: gdk.DragContext; destFile: gio.GFile; sourceFileList: ptr pointer): int!(self: ptr PlacesSidebar00; context: ptr gdk.DragContext00; destFile: ptr gio.GFile00; sourceFileList: ptr pointer): int32",
+    "drag_perform_drop!PlacesSidebar!3!(self: PlacesSidebar; destFile: gio.GFile; sourceFileList: ptr pointer; action: int)!(self: ptr PlacesSidebar00; destFile: ptr gio.GFile00; sourceFileList: ptr pointer; action: int32)",
    "mount!PlacesSidebar!1!(self: PlacesSidebar; mountOperation: gio.MountOperation)!(self: ptr PlacesSidebar00; mountOperation: ptr gio.MountOperation00)",
-    "open_location!PlacesSidebar!2!(self: PlacesSidebar; location: gio.File; openFlags: PlacesOpenFlags)!(self: ptr PlacesSidebar00; location: ptr gio.File00; openFlags: PlacesOpenFlags)",
-    "populate_popup!PlacesSidebar!3!(self: PlacesSidebar; container: Widget; selectedItem: gio.File = nil; selectedVolume: gio.Volume = nil)!(self: ptr PlacesSidebar00; container: ptr Widget00; selectedItem: ptr gio.File00; selectedVolume: ptr gio.Volume00)",
+    "open_location!PlacesSidebar!2!(self: PlacesSidebar; location: gio.GFile; openFlags: PlacesOpenFlags)!(self: ptr PlacesSidebar00; location: ptr gio.GFile00; openFlags: PlacesOpenFlags)",
+    "populate_popup!PlacesSidebar!3!(self: PlacesSidebar; container: Widget; selectedItem: gio.GFile = nil; selectedVolume: gio.Volume = nil)!(self: ptr PlacesSidebar00; container: ptr Widget00; selectedItem: ptr gio.GFile00; selectedVolume: ptr gio.Volume00)",
    "show_error_message!PlacesSidebar!2!(self: PlacesSidebar; primary: cstring; secondary: cstring)!(self: ptr PlacesSidebar00; primary: cstring; secondary: cstring)",
    "show_other_locations_with_flags!PlacesSidebar!1!(self: PlacesSidebar; openFlags: PlacesOpenFlags)!(self: ptr PlacesSidebar00; openFlags: PlacesOpenFlags)",
    "show_starred_location!PlacesSidebar!1!(self: PlacesSidebar; openFlags: PlacesOpenFlags)!(self: ptr PlacesSidebar00; openFlags: PlacesOpenFlags)",
@@ -311,7 +311,7 @@ const
    "command_line!GApplication!1!(self: GApplication; commandLine: ApplicationCommandLine): int!(self: ptr GApplication00; commandLine: ptr ApplicationCommandLine00): int32",
    "handle_local_options!GApplication!1!(self: GApplication; options: glib.VariantDict): int!(self: ptr GApplication00; options: ptr glib.VariantDict00): int32",
    "name_lost!GApplication!0!(self: GApplication): bool!(self: ptr GApplication00): gboolean",
-    "open!GApplication!3!(self: GApplication; files: File00Array; nFiles: int; hint: cstring)!(self: ptr GApplication00; files: File00Array; nFiles: int32; hint: cstring)",
+    "open!GApplication!3!(self: GApplication; files: GFile00Array; nFiles: int; hint: cstring)!(self: ptr GApplication00; files: GFile00Array; nFiles: int32; hint: cstring)",
    "action_added!ActionGroup!1!(self: ActionGroup | GApplication | DBusActionGroup | SimpleActionGroup; actionName: cstring)!(self: ptr ActionGroup00; actionName: cstring)",
    "action_enabled_changed!ActionGroup!2!(self: ActionGroup | GApplication | DBusActionGroup | SimpleActionGroup; actionName: cstring; enabled: bool)!(self: ptr ActionGroup00; actionName: cstring; enabled: gboolean)",
    "action_removed!ActionGroup!1!(self: ActionGroup | GApplication | DBusActionGroup | SimpleActionGroup; actionName: cstring)!(self: ptr ActionGroup00; actionName: cstring)",
@@ -327,7 +327,7 @@ const
    "items_changed!MenuModel!3!(self: MenuModel; position: int; removed: int; added: int)!(self: ptr MenuModel00; position: int32; removed: int32; added: int32)",
    "allow_mechanism!DBusAuthObserver!1!(self: DBusAuthObserver; mechanism: cstring): bool!(self: ptr DBusAuthObserver00; mechanism: cstring): gboolean",
    "authorize_authenticated_peer!DBusAuthObserver!2!(self: DBusAuthObserver; stream: IOStream; credentials: Credentials = nil): bool!(self: ptr DBusAuthObserver00; stream: ptr IOStream00; credentials: ptr Credentials00): gboolean",
-    "changed!FileMonitor!3!(self: FileMonitor; file: File; otherFile: File = nil; eventType: FileMonitorEvent)!(self: ptr FileMonitor00; file: ptr File00; otherFile: ptr File00; eventType: FileMonitorEvent)",
+    "changed!FileMonitor!3!(self: FileMonitor; file: GFile; otherFile: GFile = nil; eventType: FileMonitorEvent)!(self: ptr FileMonitor00; file: ptr GFile00; otherFile: ptr GFile00; eventType: FileMonitorEvent)",
    "g_properties_changed!DBusProxy!2!(self: DBusProxy; changedProperties: glib.Variant; invalidatedProperties: varargs[string, `$`])!(self: ptr DBusProxy00; changedProperties: ptr glib.Variant00; invalidatedProperties: cstringArray)",
    "g_signal!DBusProxy!3!(self: DBusProxy; senderName: cstring = \"\"; signalName: cstring; parameters: glib.Variant)!(self: ptr DBusProxy00; senderName: cstring; signalName: cstring; parameters: ptr glib.Variant00)",
    "interface_proxy_properties_changed!DBusObjectManagerClient!4!(self: DBusObjectManagerClient; objectProxy: DBusObjectProxy; interfaceProxy: DBusProxy; changedProperties: glib.Variant; invalidatedProperties: varargs[string, `$`])!(self: ptr DBusObjectManagerClient00; objectProxy: ptr DBusObjectProxy00; interfaceProxy: ptr DBusProxy00; changedProperties: ptr glib.Variant00; invalidatedProperties: cstringArray)",
@@ -377,7 +377,7 @@ const
    "change_case!View!1!(self: View; caseType: ChangeCaseType)!(self: ptr View00; caseType: ChangeCaseType)",
    "change_number!View!1!(self: View; count: int)!(self: ptr View00; count: int32)",
    "line_mark_activated!View!2!(self: View; iter: gtk.TextIter; event: gdk.Event)!(self: ptr View00; iter: gtk.TextIter; event: ptr gdk.Event00)",
-    "move_lines!View!2!(self: View; copy: bool; count: int)!(self: ptr View00; copy: gboolean; count: int32)",
+    "move_lines!View!1!(self: View; down: bool)!(self: ptr View00; down: gboolean)",
    "move_to_matching_bracket!View!1!(self: View; extendSelection: bool)!(self: ptr View00; extendSelection: gboolean)",
    "move_words!View!1!(self: View; count: int)!(self: ptr View00; count: int32)",
    "smart_home_end!View!2!(self: View; iter: gtk.TextIter; count: int)!(self: ptr View00; iter: gtk.TextIter; count: int32)",
@@ -411,4 +411,25 @@ const
    "move_window!Terminal!2!(self: Terminal; x: int; y: int)!(self: ptr Terminal00; x: uint32; y: uint32)",
    "resize_window!Terminal!2!(self: Terminal; width: int; height: int)!(self: ptr Terminal00; width: uint32; height: uint32)",
    "text_scrolled!Terminal!1!(self: Terminal; delta: int)!(self: ptr Terminal00; delta: int32)",
+    "deep_notify!Object!2!(self: Object; propObject: Object; prop: gobject.ParamSpec)!(self: ptr Object00; propObject: ptr Object00; prop: ptr gobject.ParamSpec00)",
+    "linked!Pad!1!(self: Pad; peer: Pad)!(self: ptr Pad00; peer: ptr Pad00)",
+    "unlinked!Pad!1!(self: Pad; peer: Pad)!(self: ptr Pad00; peer: ptr Pad00)",
+    "pad_added!Element!1!(self: Element; newPad: Pad)!(self: ptr Element00; newPad: ptr Pad00)",
+    "pad_removed!Element!1!(self: Element; oldPad: Pad)!(self: ptr Element00; oldPad: ptr Pad00)",
+    "deep_element_added!Bin!2!(self: Bin; subBin: Bin; element: Element)!(self: ptr Bin00; subBin: ptr Bin00; element: ptr Element00)",
+    "deep_element_removed!Bin!2!(self: Bin; subBin: Bin; element: Element)!(self: ptr Bin00; subBin: ptr Bin00; element: ptr Element00)",
+    "do_latency!Bin!0!(self: Bin): bool!(self: ptr Bin00): gboolean",
+    "element_added!Bin!1!(self: Bin; element: Element)!(self: ptr Bin00; element: ptr Element00)",
+    "element_removed!Bin!1!(self: Bin; element: Element)!(self: ptr Bin00; element: ptr Element00)",
+    "pad_created!PadTemplate!1!(self: PadTemplate; pad: Pad)!(self: ptr PadTemplate00; pad: ptr Pad00)",
+    "stream_notify!StreamCollection!2!(self: StreamCollection; `object`: Stream; p0: gobject.ParamSpec)!(self: ptr StreamCollection00; `object`: ptr Stream00; p0: ptr gobject.ParamSpec00)",
+    "synced!Clock!1!(self: Clock; synced: bool)!(self: ptr Clock00; synced: gboolean)",
+    "child_added!ChildProxy!2!(self: ChildProxy | Pipeline | Bin; `object`: gobject.Object; name: cstring)!(self: ptr ChildProxy00; `object`: ptr gobject.Object00; name: cstring)",
+    "child_removed!ChildProxy!2!(self: ChildProxy | Pipeline | Bin; `object`: gobject.Object; name: cstring)!(self: ptr ChildProxy00; `object`: ptr gobject.Object00; name: cstring)",
+    "provider_hidden!DeviceProvider!1!(self: DeviceProvider; `object`: cstring)!(self: ptr DeviceProvider00; `object`: cstring)",
+    "provider_unhidden!DeviceProvider!1!(self: DeviceProvider; `object`: cstring)!(self: ptr DeviceProvider00; `object`: cstring)",
+    "message!Bus!1!(self: Bus; message: Message)!(self: ptr Bus00; message: ptr Message00)",
+    "sync_message!Bus!1!(self: Bus; message: Message)!(self: ptr Bus00; message: ptr Message00)",
+    "feature_added!Registry!1!(self: Registry; feature: PluginFeature)!(self: ptr Registry00; feature: ptr PluginFeature00)",
+    "plugin_added!Registry!1!(self: Registry; plugin: Plugin)!(self: ptr Registry00; plugin: ptr Plugin00)",
  ]
--- a/gintro/gisup4.nim
+++ b/gintro/gisup4.nim
@@ -5,7 +5,7 @@ const
    "command_line!GApplication!1!(self: GApplication; commandLine: ApplicationCommandLine): int!(self: ptr GApplication00; commandLine: ptr ApplicationCommandLine00): int32",
    "handle_local_options!GApplication!1!(self: GApplication; options: glib.VariantDict): int!(self: ptr GApplication00; options: ptr glib.VariantDict00): int32",
    "name_lost!GApplication!0!(self: GApplication): bool!(self: ptr GApplication00): gboolean",
-    "open!GApplication!3!(self: GApplication; files: File00Array; nFiles: int; hint: cstring)!(self: ptr GApplication00; files: File00Array; nFiles: int32; hint: cstring)",
+    "open!GApplication!3!(self: GApplication; files: GFile00Array; nFiles: int; hint: cstring)!(self: ptr GApplication00; files: GFile00Array; nFiles: int32; hint: cstring)",
    "action_added!ActionGroup!1!(self: ActionGroup | GApplication | SimpleActionGroup | DBusActionGroup; actionName: cstring)!(self: ptr ActionGroup00; actionName: cstring)",
    "action_enabled_changed!ActionGroup!2!(self: ActionGroup | GApplication | SimpleActionGroup | DBusActionGroup; actionName: cstring; enabled: bool)!(self: ptr ActionGroup00; actionName: cstring; enabled: gboolean)",
    "action_removed!ActionGroup!1!(self: ActionGroup | GApplication | SimpleActionGroup | DBusActionGroup; actionName: cstring)!(self: ptr ActionGroup00; actionName: cstring)",
@@ -21,7 +21,7 @@ const
    "items_changed!MenuModel!3!(self: MenuModel; position: int; removed: int; added: int)!(self: ptr MenuModel00; position: int32; removed: int32; added: int32)",
    "allow_mechanism!DBusAuthObserver!1!(self: DBusAuthObserver; mechanism: cstring): bool!(self: ptr DBusAuthObserver00; mechanism: cstring): gboolean",
    "authorize_authenticated_peer!DBusAuthObserver!2!(self: DBusAuthObserver; stream: IOStream; credentials: Credentials = nil): bool!(self: ptr DBusAuthObserver00; stream: ptr IOStream00; credentials: ptr Credentials00): gboolean",
-    "changed!FileMonitor!3!(self: FileMonitor; file: File; otherFile: File = nil; eventType: FileMonitorEvent)!(self: ptr FileMonitor00; file: ptr File00; otherFile: ptr File00; eventType: FileMonitorEvent)",
+    "changed!FileMonitor!3!(self: FileMonitor; file: GFile; otherFile: GFile = nil; eventType: FileMonitorEvent)!(self: ptr FileMonitor00; file: ptr GFile00; otherFile: ptr GFile00; eventType: FileMonitorEvent)",
    "g_properties_changed!DBusProxy!2!(self: DBusProxy; changedProperties: glib.Variant; invalidatedProperties: varargs[string, `$`])!(self: ptr DBusProxy00; changedProperties: ptr glib.Variant00; invalidatedProperties: cstringArray)",
    "g_signal!DBusProxy!3!(self: DBusProxy; senderName: cstring = \"\"; signalName: cstring; parameters: glib.Variant)!(self: ptr DBusProxy00; senderName: cstring; signalName: cstring; parameters: ptr glib.Variant00)",
    "interface_proxy_properties_changed!DBusObjectManagerClient!4!(self: DBusObjectManagerClient; objectProxy: DBusObjectProxy; interfaceProxy: DBusProxy; changedProperties: glib.Variant; invalidatedProperties: varargs[string, `$`])!(self: ptr DBusObjectManagerClient00; objectProxy: ptr DBusObjectProxy00; interfaceProxy: ptr DBusProxy00; changedProperties: ptr glib.Variant00; invalidatedProperties: cstringArray)",
@@ -79,4 +79,25 @@ const
    "text_insert!Text!3!(self: Text | NoOpObject; arg1: int; arg2: int; arg3: cstring)!(self: ptr Text00; arg1: int32; arg2: int32; arg3: cstring)",
    "text_remove!Text!3!(self: Text | NoOpObject; arg1: int; arg2: int; arg3: cstring)!(self: ptr Text00; arg1: int32; arg2: int32; arg3: cstring)",
    "value_changed!Value!2!(self: Value | NoOpObject; value: cdouble; text: cstring)!(self: ptr Value00; value: cdouble; text: cstring)",
+    "deep_notify!Object!2!(self: Object; propObject: Object; prop: gobject.ParamSpec)!(self: ptr Object00; propObject: ptr Object00; prop: ptr gobject.ParamSpec00)",
+    "linked!Pad!1!(self: Pad; peer: Pad)!(self: ptr Pad00; peer: ptr Pad00)",
+    "unlinked!Pad!1!(self: Pad; peer: Pad)!(self: ptr Pad00; peer: ptr Pad00)",
+    "pad_added!Element!1!(self: Element; newPad: Pad)!(self: ptr Element00; newPad: ptr Pad00)",
+    "pad_removed!Element!1!(self: Element; oldPad: Pad)!(self: ptr Element00; oldPad: ptr Pad00)",
+    "deep_element_added!Bin!2!(self: Bin; subBin: Bin; element: Element)!(self: ptr Bin00; subBin: ptr Bin00; element: ptr Element00)",
+    "deep_element_removed!Bin!2!(self: Bin; subBin: Bin; element: Element)!(self: ptr Bin00; subBin: ptr Bin00; element: ptr Element00)",
+    "do_latency!Bin!0!(self: Bin): bool!(self: ptr Bin00): gboolean",
+    "element_added!Bin!1!(self: Bin; element: Element)!(self: ptr Bin00; element: ptr Element00)",
+    "element_removed!Bin!1!(self: Bin; element: Element)!(self: ptr Bin00; element: ptr Element00)",
+    "pad_created!PadTemplate!1!(self: PadTemplate; pad: Pad)!(self: ptr PadTemplate00; pad: ptr Pad00)",
+    "stream_notify!StreamCollection!2!(self: StreamCollection; `object`: Stream; p0: gobject.ParamSpec)!(self: ptr StreamCollection00; `object`: ptr Stream00; p0: ptr gobject.ParamSpec00)",
+    "synced!Clock!1!(self: Clock; synced: bool)!(self: ptr Clock00; synced: gboolean)",
+    "child_added!ChildProxy!2!(self: ChildProxy | Pipeline | Bin; `object`: gobject.Object; name: cstring)!(self: ptr ChildProxy00; `object`: ptr gobject.Object00; name: cstring)",
+    "child_removed!ChildProxy!2!(self: ChildProxy | Pipeline | Bin; `object`: gobject.Object; name: cstring)!(self: ptr ChildProxy00; `object`: ptr gobject.Object00; name: cstring)",
+    "provider_hidden!DeviceProvider!1!(self: DeviceProvider; `object`: cstring)!(self: ptr DeviceProvider00; `object`: cstring)",
+    "provider_unhidden!DeviceProvider!1!(self: DeviceProvider; `object`: cstring)!(self: ptr DeviceProvider00; `object`: cstring)",
+    "message!Bus!1!(self: Bus; message: Message)!(self: ptr Bus00; message: ptr Message00)",
+    "sync_message!Bus!1!(self: Bus; message: Message)!(self: ptr Bus00; message: ptr Message00)",
+    "feature_added!Registry!1!(self: Registry; feature: PluginFeature)!(self: ptr Registry00; feature: ptr PluginFeature00)",
+    "plugin_added!Registry!1!(self: Registry; plugin: Plugin)!(self: ptr Registry00; plugin: ptr Plugin00)",
  ]
--- a/gintro/glib.nim
+++ b/gintro/glib.nim
@@ -3323,7 +3323,8 @@ proc g_io_channel_read_chars(self: ptr IOChannel00; buf: uint8Array; count: uint
    bytesRead: var uint64; error: ptr ptr glib.Error = nil): IOStatus {.
    importc, libprag.}

-proc readChars*(self: IOChannel; buf: var seq[uint8]; bytesRead: var uint64): IOStatus =
+proc readChars*(self: IOChannel; buf: var (seq[uint8] | string);
+    bytesRead: var uint64): IOStatus =
  let count = uint64(buf.len)
  var gerror: ptr glib.Error
  let resul0 = g_io_channel_read_chars(cast[ptr IOChannel00](self.impl), unsafeaddr(buf[0]), count, bytesRead, addr gerror)
@@ -3366,7 +3367,7 @@ proc g_io_channel_read_to_end(self: ptr IOChannel00; strReturn: var uint8Array;
    length: var uint64; error: ptr ptr glib.Error = nil): IOStatus {.
    importc, libprag.}

-proc readToEnd*(self: IOChannel; strReturn: var seq[uint8];
+proc readToEnd*(self: IOChannel; strReturn: var (seq[uint8] | string);
    length: var uint64): IOStatus =
  var gerror: ptr glib.Error
  var strReturn_00: pointer

--- a/gintro/gst.nim
+++ b/gintro/gst.nim
--- a/gintro/gtk.nim
+++ b/gintro/gtk.nim
--- a/gintro/gtksource.nim
+++ b/gintro/gtksource.nim
--- a/gintro/harfbuzz.nim
+++ b/gintro/harfbuzz.nim
@@ -1104,8 +1104,8 @@ proc hb_buffer_serialize_glyphs(buffer: ptr bufferT00; start: uint32; `end`: uin
    importc, libprag.}

 proc bufferSerializeGlyphs*(buffer: bufferT; start: int; `end`: int;
-    buf: var seq[uint8]; bufSize: var int; bufConsumed: var int; font: fontT = nil;
-    format: bufferSerializeFormatT; flags: bufferSerializeFlagsT): int =
+    buf: var (seq[uint8] | string); bufSize: var int; bufConsumed: var int;
+    font: fontT = nil; format: bufferSerializeFormatT; flags: bufferSerializeFlagsT): int =
  var bufSize_00 = uint32(bufSize)
  var bufConsumed_00 = uint32(bufConsumed)
  var buf_00: pointer

--- a/gintro/rsvg.nim
+++ b/gintro/rsvg.nim
@@ -413,14 +413,14 @@ proc rsvg_handle_render_cairo_sub(self: ptr Handle00; cr: ptr cairo.Context00;
 proc renderCairoSub*(self: Handle; cr: cairo.Context; id: cstring = ""): bool =
  toBool(rsvg_handle_render_cairo_sub(cast[ptr Handle00](self.impl), cast[ptr cairo.Context00](cr.impl), safeStringToCString(id)))

-proc rsvg_handle_set_base_gfile(self: ptr Handle00; baseFile: ptr gio.File00) {.
+proc rsvg_handle_set_base_gfile(self: ptr Handle00; baseFile: ptr gio.GFile00) {.
    importc, libprag.}

-proc setBaseGfile*(self: Handle; baseFile: gio.File) =
-  rsvg_handle_set_base_gfile(cast[ptr Handle00](self.impl), cast[ptr gio.File00](baseFile.impl))
+proc setBaseGfile*(self: Handle; baseFile: gio.GFile) =
+  rsvg_handle_set_base_gfile(cast[ptr Handle00](self.impl), cast[ptr gio.GFile00](baseFile.impl))

-proc `baseGfile=`*(self: Handle; baseFile: gio.File) =
-  rsvg_handle_set_base_gfile(cast[ptr Handle00](self.impl), cast[ptr gio.File00](baseFile.impl))
+proc `baseGfile=`*(self: Handle; baseFile: gio.GFile) =
+  rsvg_handle_set_base_gfile(cast[ptr Handle00](self.impl), cast[ptr gio.GFile00](baseFile.impl))

 proc rsvg_handle_set_base_uri(self: ptr Handle00; baseUri: cstring) {.
    importc, libprag.}
@@ -481,14 +481,14 @@ type

  HandleFlags* {.size: sizeof(cint).} = set[HandleFlag]

-proc rsvg_handle_new_from_gfile_sync(file: ptr gio.File00; flags: HandleFlags;
+proc rsvg_handle_new_from_gfile_sync(file: ptr gio.GFile00; flags: HandleFlags;
    cancellable: ptr gio.Cancellable00; error: ptr ptr glib.Error = nil): ptr Handle00 {.
    importc, libprag.}

-proc newHandleFromGfileSync*(file: gio.File; flags: HandleFlags;
+proc newHandleFromGfileSync*(file: gio.GFile; flags: HandleFlags;
    cancellable: gio.Cancellable = nil): Handle =
  var gerror: ptr glib.Error
-  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.File00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.GFile00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])
@@ -508,11 +508,11 @@ proc newHandleFromGfileSync*(file: gio.File; flags: HandleFlags;
    assert(g_object_get_qdata(result.impl, Quark) == nil)
    g_object_set_qdata(result.impl, Quark, addr(result[]))

-proc newHandleFromGfileSync*(tdesc: typedesc; file: gio.File; flags: HandleFlags;
+proc newHandleFromGfileSync*(tdesc: typedesc; file: gio.GFile; flags: HandleFlags;
    cancellable: gio.Cancellable = nil): tdesc =
  var gerror: ptr glib.Error
  assert(result is Handle)
-  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.File00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.GFile00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])
@@ -532,11 +532,11 @@ proc newHandleFromGfileSync*(tdesc: typedesc; file: gio.File; flags: HandleFlags
    assert(g_object_get_qdata(result.impl, Quark) == nil)
    g_object_set_qdata(result.impl, Quark, addr(result[]))

-proc initHandleFromGfileSync*[T](result: var T; file: gio.File; flags: HandleFlags;
+proc initHandleFromGfileSync*[T](result: var T; file: gio.GFile; flags: HandleFlags;
    cancellable: gio.Cancellable = nil) {.deprecated.} =
  var gerror: ptr glib.Error
  assert(result is Handle)
-  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.File00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_gfile_sync(cast[ptr gio.GFile00](file.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])
@@ -557,14 +557,14 @@ proc initHandleFromGfileSync*[T](result: var T; file: gio.File; flags: HandleFla
    g_object_set_qdata(result.impl, Quark, addr(result[]))

 proc rsvg_handle_new_from_stream_sync(inputStream: ptr gio.InputStream00;
-    baseFile: ptr gio.File00; flags: HandleFlags; cancellable: ptr gio.Cancellable00;
+    baseFile: ptr gio.GFile00; flags: HandleFlags; cancellable: ptr gio.Cancellable00;
    error: ptr ptr glib.Error = nil): ptr Handle00 {.
    importc, libprag.}

-proc newHandleFromStreamSync*(inputStream: gio.InputStream; baseFile: gio.File = nil;
+proc newHandleFromStreamSync*(inputStream: gio.InputStream; baseFile: gio.GFile = nil;
    flags: HandleFlags; cancellable: gio.Cancellable = nil): Handle =
  var gerror: ptr glib.Error
-  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.File00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.GFile00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])
@@ -584,11 +584,11 @@ proc newHandleFromStreamSync*(inputStream: gio.InputStream; baseFile: gio.File =
    assert(g_object_get_qdata(result.impl, Quark) == nil)
    g_object_set_qdata(result.impl, Quark, addr(result[]))

-proc newHandleFromStreamSync*(tdesc: typedesc; inputStream: gio.InputStream; baseFile: gio.File = nil;
+proc newHandleFromStreamSync*(tdesc: typedesc; inputStream: gio.InputStream; baseFile: gio.GFile = nil;
    flags: HandleFlags; cancellable: gio.Cancellable = nil): tdesc =
  var gerror: ptr glib.Error
  assert(result is Handle)
-  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.File00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.GFile00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])
@@ -608,11 +608,11 @@ proc newHandleFromStreamSync*(tdesc: typedesc; inputStream: gio.InputStream; bas
    assert(g_object_get_qdata(result.impl, Quark) == nil)
    g_object_set_qdata(result.impl, Quark, addr(result[]))

-proc initHandleFromStreamSync*[T](result: var T; inputStream: gio.InputStream; baseFile: gio.File = nil;
+proc initHandleFromStreamSync*[T](result: var T; inputStream: gio.InputStream; baseFile: gio.GFile = nil;
    flags: HandleFlags; cancellable: gio.Cancellable = nil) {.deprecated.} =
  var gerror: ptr glib.Error
  assert(result is Handle)
-  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.File00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
+  let gobj = rsvg_handle_new_from_stream_sync(cast[ptr gio.InputStream00](inputStream.impl), if baseFile.isNil: nil else: cast[ptr gio.GFile00](baseFile.impl), flags, if cancellable.isNil: nil else: cast[ptr gio.Cancellable00](cancellable.impl), addr gerror)
  if gerror != nil:
    let msg = $gerror.message
    g_error_free(gerror[])