Various manual fixes

- GLib: Workaround duplicated types in the GLib namspace being preferred
- Gio: Hide internal impl details leaking in the introspection
- Gdk: Replace windows specific types with gpointer

Author: bilelmoussaoui

GLibUnix-2.0.gir

@@ -63,7 +63,7 @@ This function preserves the value of `errno`.</doc>
         <parameters>
           <parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve">a #GUnixPipe</doc>
-            <type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
+            <type name="GLibUnix.Pipe" c:type="GUnixPipe*"/>
           </parameter>
         </parameters>
       </function>
@@ -91,11 +91,11 @@ g_unix_pipe_clear() instead.</doc>
         <parameters>
           <parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve">A pair of file descriptors</doc>
-            <type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
+            <type name="GLibUnix.Pipe" c:type="GUnixPipe*"/>
           </parameter>
           <parameter name="end" transfer-ownership="none">
             <doc xml:space="preserve">One of the ends of the pipe</doc>
-            <type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
+            <type name="GLibUnix.PipeEnd" c:type="GUnixPipeEnd"/>
           </parameter>
         </parameters>
       </function>
@@ -116,11 +116,11 @@ This function preserves the value of `errno`.</doc>
         <parameters>
           <parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve">A pair of file descriptors</doc>
-            <type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
+            <type name="GLibUnix.Pipe" c:type="GUnixPipe*"/>
           </parameter>
           <parameter name="end" transfer-ownership="none">
             <doc xml:space="preserve">One of the ends of the pipe</doc>
-            <type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
+            <type name="GLibUnix.PipeEnd" c:type="GUnixPipeEnd"/>
           </parameter>
         </parameters>
       </function>
@@ -134,7 +134,7 @@ This function preserves the value of `errno`.</doc>
         <parameters>
           <parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve">A pair of file descriptors</doc>
-            <type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
+            <type name="GLibUnix.Pipe" c:type="GUnixPipe*"/>
           </parameter>
           <parameter name="flags" transfer-ownership="none">
             <doc xml:space="preserve">Flags to pass to g_unix_open_pipe(), typically `O_CLOEXEC`</doc>
@@ -161,11 +161,11 @@ This function preserves the value of `errno`.</doc>
         <parameters>
           <parameter name="self" transfer-ownership="none">
             <doc xml:space="preserve">A pair of file descriptors</doc>
-            <type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
+            <type name="GLibUnix.Pipe" c:type="GUnixPipe*"/>
           </parameter>
           <parameter name="end" transfer-ownership="none">
             <doc xml:space="preserve">One of the ends of the pipe</doc>
-            <type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
+            <type name="GLibUnix.PipeEnd" c:type="GUnixPipeEnd"/>
           </parameter>
         </parameters>
       </function>

GLibWin32-2.0.gir

@@ -40,7 +40,7 @@ and/or use gtk-doc annotations.  -->
           <type name="gint" c:type="const gint"/>
         </parameter>
         <parameter name="os_type" transfer-ownership="none">
-          <type name="GLib.Win32OSType" c:type="const GWin32OSType"/>
+          <type name="OSType" c:type="const GWin32OSType"/>
         </parameter>
       </parameters>
     </function>

GdkWin32-4.0.gir

@@ -111,7 +111,7 @@ possibly with changing properties in between.</doc>
 associated with.</doc>
         <return-value transfer-ownership="none" nullable="1">
           <doc xml:space="preserve">the fence</doc>
-          <type c:type="ID3D12Fence*"/>
+          <type c:type="gpointer" name="gpointer"/>
         </return-value>
         <parameters>
           <instance-parameter name="self" transfer-ownership="none">
@@ -152,7 +152,7 @@ before using the resource.</doc>
 associated with.</doc>
         <return-value transfer-ownership="none" nullable="1">
           <doc xml:space="preserve">the resource</doc>
-          <type c:type="ID3D12Resource*"/>
+          <type c:type="gpointer" name="gpointer"/>
         </return-value>
         <parameters>
           <instance-parameter name="self" transfer-ownership="none">
@@ -222,7 +222,7 @@ a texture for.</doc>
           </instance-parameter>
           <parameter name="fence" transfer-ownership="none">
             <doc xml:space="preserve">the fence</doc>
-            <type c:type="ID3D12Fence*"/>
+            <type c:type="gpointer" name="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -277,7 +277,7 @@ a texture for.</doc>
           </instance-parameter>
           <parameter name="resource" transfer-ownership="none">
             <doc xml:space="preserve">the resource</doc>
-            <type c:type="ID3D12Resource*"/>
+            <type c:type="gpointer" name="gpointer"/>
           </parameter>
         </parameters>
       </method>

GioWin32-2.0.gir

@@ -218,15 +218,15 @@ when the stream is closed.</doc>
     </function-macro>
     <record name="NetworkMonitor" c:type="GWin32NetworkMonitor">
       <field name="parent_instance" introspectable="0" writable="1">
-        <type c:type="GNetworkMonitorBase"/>
+        <type c:type="GNetworkMonitorBase" name="gpointer"/>
       </field>
       <field name="priv" writable="1">
         <type name="NetworkMonitorPrivate" c:type="GWin32NetworkMonitorPrivate*"/>
       </field>
     </record>
     <record name="NetworkMonitorClass" c:type="GWin32NetworkMonitorClass">
       <field name="parent_class" introspectable="0" writable="1">
-        <type c:type="GNetworkMonitorBaseClass"/>
+        <type c:type="GNetworkMonitorBaseClass" name="gpointer"/>
       </field>
     </record>
     <record name="NetworkMonitorPrivate" c:type="GWin32NetworkMonitorPrivate" disguised="1" opaque="1"/>

fix.sh

@@ -169,6 +169,10 @@ xmlstarlet ed -L \
     -u '//_:function[@name="win32_set_modal_dialog_libgtk_only"]//_:type[@name="win32.HWND"]/@c:type' -v 'gssize' \
     -u '//_:function[@name="win32_icon_to_pixbuf_libgtk_only"]//_:type[@name="win32.HICON"]/@c:type' -v 'gssize' \
     -u '//_:function[@name="win32_pixbuf_to_hicon_libgtk_only"]//_:type[@name="win32.HICON"]/@c:type' -v 'gssize' \
+	-i '//_:type[@c:type="ID3D12Fence*" and not(@name)]' -t 'attr' -n 'name' -v "gpointer" \
+	-u '//_:type[@c:type="ID3D12Fence*"]/@c:type' -v "gpointer" \
+	-i '//_:type[@c:type="ID3D12Resource*" and not(@name)]' -t 'attr' -n 'name' -v "gpointer" \
+	-u '//_:type[@c:type="ID3D12Resource*"]/@c:type' -v "gpointer" \
 	GdkWin32-4.0.gir
 
 # Fix invalid type for GtkImage and GtkStackSwitcher "icon-size" property
@@ -178,3 +182,20 @@ xmlstarlet ed -L \
 	-u '//_:class[@name="StackSwitcher"]/_:property[@name="icon-size"]/_:type/@c:type' -v "GtkIconSize" \
 	-u '//_:class[@name="StackSwitcher"]/_:property[@name="icon-size"]/_:type/@name' -v "IconSize" \
 	Gtk-3.0.gir
+
+# Fix GLibUnix type names to use GLibUnix prefix instead of GLib
+xmlstarlet ed -L \
+	-u '//_:type[@name="GLib.UnixPipe"]/@name' -v "GLibUnix.Pipe" \
+	-u '//_:type[@name="GLib.UnixPipeEnd"]/@name' -v "GLibUnix.PipeEnd" \
+	GLibUnix-2.0.gir
+
+# Fix GLibWin32 type name to remove GLib prefix
+xmlstarlet ed -L \
+	-u '//_:type[@name="GLib.Win32OSType"]/@name' -v "OSType" \
+	GLibWin32-2.0.gir
+
+# Fix GioWin32 NetworkMonitor types to use gpointer
+xmlstarlet ed -L \
+	-i '//_:record[@name="NetworkMonitor"]/_:field[@name="parent_instance"]/_:type[@c:type="GNetworkMonitorBase" and not(@name)]' -t 'attr' -n 'name' -v "gpointer" \
+	-i '//_:record[@name="NetworkMonitorClass"]/_:field[@name="parent_class"]/_:type[@c:type="GNetworkMonitorBaseClass" and not(@name)]' -t 'attr' -n 'name' -v "gpointer" \
+	GioWin32-2.0.gir