Remove protocol names, instead use an enum with common protocols

The whole protocol name thing is pretty weird. The getprotobyname functions
seem to only specify one mapping for name <-> ids, so all families/types
must use the same values. Plus the values used for the protocols are
standardized by IANA, so are always the same.

So, we drop using names for protocols, intead introducing an enum with
a few commonly availible and used protocols.

5 files changed, 330 insertions, 3 deletions

diff --git a/docs/reference/gio/#gio-unused.txt# b/docs/reference/gio/#gio-unused.txt#
new file mode 100644
index 000000000..bf3faa5a1
--- /dev/null
+++ b/docs/reference/gio/#gio-unused.txt#
@@ -0,0 +1,100 @@
+GFenDirectoryMonitor
+GFenDirectoryMonitorClass
+GFenFileMonitor
+GFenFileMonitorClass
+GLocalFileIOStream
+GLocalFileIOStreamClass
+GLocalFileIOStreamPrivate
+GSocketInputStream
+GSocketInputStreamClass
+GSocketInputStreamPrivate
+GSocketOutputStream
+GSocketOutputStreamClass
+GSocketOutputStreamPrivate
+GWin32DirectoryMonitor
+GWin32DirectoryMonitorClass
+GWin32DirectoryMonitorPrivate
+GWin32Mount
+GWin32MountClass
+GWin32Volume
+GWin32VolumeMonitor
+GWin32VolumeMonitorClass
+GWinHttpDllFuncs
+GWinHttpFile
+GWinHttpFileClass
+GWinHttpFileInputStream
+GWinHttpFileInputStreamClass
+GWinHttpFileOutputStream
+GWinHttpFileOutputStreamClass
+GWinHttpVfs
+GWinHttpVfsClass
+G_FEN_DIRECTORY_MONITOR
+G_FEN_DIRECTORY_MONITOR_CLASS
+G_FEN_FILE_MONITOR
+G_FEN_FILE_MONITOR_CLASS
+G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE
+G_IS_FEN_DIRECTORY_MONITOR
+G_IS_FEN_DIRECTORY_MONITOR_CLASS
+G_IS_FEN_FILE_MONITOR
+G_IS_FEN_FILE_MONITOR_CLASS
+G_IS_LOCAL_FILE_IO_STREAM
+G_IS_LOCAL_FILE_IO_STREAM_CLASS
+G_IS_SOCKET_INPUT_STREAM
+G_IS_SOCKET_INPUT_STREAM_CLASS
+G_IS_SOCKET_OUTPUT_STREAM
+G_IS_SOCKET_OUTPUT_STREAM_CLASS
+G_IS_WIN32_DIRECTORY_MONITOR
+G_IS_WIN32_DIRECTORY_MONITOR_CLASS
+G_IS_WIN32_MOUNT
+G_IS_WIN32_MOUNT_CLASS
+G_IS_WIN32_VOLUME_MONITOR
+G_IS_WIN32_VOLUME_MONITOR_CLASS
+G_IS_WINHTTP_FILE
+G_IS_WINHTTP_FILE_CLASS
+G_IS_WINHTTP_FILE_INPUT_STREAM
+G_IS_WINHTTP_FILE_INPUT_STREAM_CLASS
+G_IS_WINHTTP_FILE_OUTPUT_STREAM
+G_IS_WINHTTP_FILE_OUTPUT_STREAM_CLASS
+G_IS_WINHTTP_VFS
+G_IS_WINHTTP_VFS_CLASS
+G_LOCAL_FILE_IO_STREAM
+G_LOCAL_FILE_IO_STREAM_CLASS
+G_LOCAL_FILE_IO_STREAM_GET_CLASS
+G_SOCKET_INPUT_STREAM
+G_SOCKET_INPUT_STREAM_CLASS
+G_SOCKET_INPUT_STREAM_GET_CLASS
+G_SOCKET_OUTPUT_STREAM
+G_SOCKET_OUTPUT_STREAM_CLASS
+G_SOCKET_OUTPUT_STREAM_GET_CLASS
+G_TYPE_FEN_DIRECTORY_MONITOR
+G_TYPE_FEN_FILE_MONITOR
+G_TYPE_LOCAL_FILE_IO_STREAM
+G_TYPE_SOCKET_OUTPUT_STREAM
+G_TYPE_WIN32_DIRECTORY_MONITOR
+G_TYPE_WIN32_MOUNT
+G_TYPE_WIN32_VOLUME_MONITOR
+G_TYPE_WINHTTP_FILE
+G_TYPE_WINHTTP_FILE_INPUT_STREAM
+G_TYPE_WINHTTP_FILE_OUTPUT_STREAM
+G_TYPE_WINHTTP_VFS
+G_WIN32_DIRECTORY_MONITOR
+G_WIN32_DIRECTORY_MONITOR_CLASS
+G_WIN32_DIRECTORY_MONITOR_GET_CLASS
+G_WIN32_MOUNT
+G_WIN32_MOUNT_CLASS
+G_WIN32_VOLUME_MONITOR
+G_WIN32_VOLUME_MONITOR_CLASS
+G_WINHTTP_FILE
+G_WINHTTP_FILE_CLASS
+G_WINHTTP_FILE_GET_CLASS
+G_WINHTTP_FILE_INPUT_STREAM
+G_WINHTTP_FILE_INPUT_STREAM_CLASS
+G_WINHTTP_FILE_INPUT_STREAM_GET_CLASS
+G_WINHTTP_FILE_OUTPUT_STREAM
+G_WINHTTP_FILE_OUTPUT_STREAM_CLASS
+G_WINHTTP_FILE_OUTPUT_STREAM_GET_CLASS
+G_WINHTTP_VFS
+G_WINHTTP_VFS_CLASS
+G_WINHTTP_VFS_GET_CLASS
+g_win32_directory_monitor_get_type
+g_win32_directory_monitor_register
diff --git a/docs/reference/gio/aa b/docs/reference/gio/aa
new file mode 100644
index 000000000..13ab1c020
--- /dev/null
+++ b/docs/reference/gio/aa
@@ -0,0 +1,74 @@
+               
+<book lang=
+<!ENTITY version SYSTEM 
+xml/extensionpoints.xml
+xml/gappinfo.xml
+xml/gasyncinitable.xml
+xml/gasyncresult.xml
+xml/gbufferedinputstream.xml
+xml/gbufferedoutputstream.xml
+xml/gcancellable.xml
+xml/gcontenttype.xml
+xml/gdatainputstream.xml
+xml/gdataoutputstream.xml
+xml/gdesktopappinfo.xml
+xml/gdrive.xml
+xml/gemblemedicon.xml
+xml/gemblem.xml
+xml/gfileattribute.xml
+xml/gfileenumerator.xml
+xml/gfileicon.xml
+xml/gfileinfo.xml
+xml/gfileinputstream.xml
+xml/gfileiostream.xml
+xml/gfilemonitor.xml
+xml/gfilenamecompleter.xml
+xml/gfileoutputstream.xml
+xml/gfile.xml
+xml/gfilterinputstream.xml
+xml/gfilteroutputstream.xml
+xml/gicon.xml
+xml/ginetaddress.xml
+xml/ginetsocketaddress.xml
+xml/ginitable.xml
+xml/ginputstream.xml
+xml/gioerror.xml
+xml/giomodule.xml
+xml/gioscheduler.xml
+xml/giostream.xml
+xml/gloadableicon.xml
+xml/gmemoryinputstream.xml
+xml/gmemoryoutputstream.xml
+xml/gmountoperation.xml
+xml/gmount.xml
+xml/gnetworkaddress.xml
+xml/gnetworkservice.xml
+xml/goutputstream.xml
+xml/gresolver.xml
+xml/gseekable.xml
+xml/gsimpleasyncresult.xml
+xml/gsocketaddress.xml
+xml/gsocketclient.xml
+xml/gsocketconnectable.xml
+xml/gsocketconnection.xml
+xml/gsocketcontrolmessage.xml
+xml/gsocketlistener.xml
+xml/gsocketservice.xml
+xml/gsocket.xml
+xml/gsrvtarget.xml
+xml/gtcpconnection.xml
+xml/gthemedicon.xml
+xml/gthreadedsocketservice.xml
+xml/gunixconnection.xml
+xml/gunixfdmessage.xml
+xml/gunixinputstream.xml
+xml/gunixmounts.xml
+xml/gunixoutputstream.xml
+xml/gunixsocketaddress.xml
+xml/gvfs.xml
+xml/gvolumemonitor.xml
+xml/gvolume.xml
+xml/migrating.xml
+xml/overview.xml
+xml/tree_index.sgml
+<?xml version=
diff --git a/docs/reference/gio/b b/docs/reference/gio/b
new file mode 100644
index 000000000..4bf6ec2b5
--- /dev/null
+++ b/docs/reference/gio/b
@@ -0,0 +1,77 @@
+xml/api-index-2.18.xml
+xml/api-index-2.18..xml
+xml/api-index-2,20.xml
+xml/api-index-2.20.xml
+xml/api-index-2.22.xml
+xml/api-index-2.22..xml
+xml/api-index-deprecated.xml
+xml/api-index-full.xml
+xml/extensionpoints.xml
+xml/gappinfo.xml
+xml/gasyncinitable.xml
+xml/gasyncresult.xml
+xml/gbufferedinputstream.xml
+xml/gbufferedoutputstream.xml
+xml/gcancellable.xml
+xml/gcontenttype.xml
+xml/gdatainputstream.xml
+xml/gdataoutputstream.xml
+xml/gdesktopappinfo.xml
+xml/gdrive.xml
+xml/gemblemedicon.xml
+xml/gemblem.xml
+xml/gfileattribute.xml
+xml/gfileenumerator.xml
+xml/gfileicon.xml
+xml/gfileinfo.xml
+xml/gfileinputstream.xml
+xml/gfileiostream.xml
+xml/gfilemonitor.xml
+xml/gfilenamecompleter.xml
+xml/gfileoutputstream.xml
+xml/gfile.xml
+xml/gfilterinputstream.xml
+xml/gfilteroutputstream.xml
+xml/gicon.xml
+xml/ginetaddress.xml
+xml/ginetsocketaddress.xml
+xml/ginitable.xml
+xml/ginputstream.xml
+xml/gioerror.xml
+xml/giomodule.xml
+xml/gioscheduler.xml
+xml/giostream.xml
+xml/gloadableicon.xml
+xml/gmemoryinputstream.xml
+xml/gmemoryoutputstream.xml
+xml/gmountoperation.xml
+xml/gmount.xml
+xml/gnetworkaddress.xml
+xml/gnetworkservice.xml
+xml/goutputstream.xml
+xml/gresolver.xml
+xml/gseekable.xml
+xml/gsimpleasyncresult.xml
+xml/gsocketaddress.xml
+xml/gsocketclient.xml
+xml/gsocketconnectable.xml
+xml/gsocketconnection.xml
+xml/gsocketcontrolmessage.xml
+xml/gsocketlistener.xml
+xml/gsocketservice.xml
+xml/gsocket.xml
+xml/gsrvtarget.xml
+xml/gtcpconnection.xml
+xml/gthemedicon.xml
+xml/gthreadedsocketservice.xml
+xml/gunixconnection.xml
+xml/gunixfdmessage.xml
+xml/gunixinputstream.xml
+xml/gunixmounts.xml
+xml/gunixoutputstream.xml
+xml/gunixsocketaddress.xml
+xml/gvfs.xml
+xml/gvolumemonitor.xml
+xml/gvolume.xml
+xml/migrating.xml
+xml/overview.xml
diff --git a/docs/reference/gio/bb b/docs/reference/gio/bb
new file mode 100644
index 000000000..4bf6ec2b5
--- /dev/null
+++ b/docs/reference/gio/bb
@@ -0,0 +1,77 @@
+xml/api-index-2.18.xml
+xml/api-index-2.18..xml
+xml/api-index-2,20.xml
+xml/api-index-2.20.xml
+xml/api-index-2.22.xml
+xml/api-index-2.22..xml
+xml/api-index-deprecated.xml
+xml/api-index-full.xml
+xml/extensionpoints.xml
+xml/gappinfo.xml
+xml/gasyncinitable.xml
+xml/gasyncresult.xml
+xml/gbufferedinputstream.xml
+xml/gbufferedoutputstream.xml
+xml/gcancellable.xml
+xml/gcontenttype.xml
+xml/gdatainputstream.xml
+xml/gdataoutputstream.xml
+xml/gdesktopappinfo.xml
+xml/gdrive.xml
+xml/gemblemedicon.xml
+xml/gemblem.xml
+xml/gfileattribute.xml
+xml/gfileenumerator.xml
+xml/gfileicon.xml
+xml/gfileinfo.xml
+xml/gfileinputstream.xml
+xml/gfileiostream.xml
+xml/gfilemonitor.xml
+xml/gfilenamecompleter.xml
+xml/gfileoutputstream.xml
+xml/gfile.xml
+xml/gfilterinputstream.xml
+xml/gfilteroutputstream.xml
+xml/gicon.xml
+xml/ginetaddress.xml
+xml/ginetsocketaddress.xml
+xml/ginitable.xml
+xml/ginputstream.xml
+xml/gioerror.xml
+xml/giomodule.xml
+xml/gioscheduler.xml
+xml/giostream.xml
+xml/gloadableicon.xml
+xml/gmemoryinputstream.xml
+xml/gmemoryoutputstream.xml
+xml/gmountoperation.xml
+xml/gmount.xml
+xml/gnetworkaddress.xml
+xml/gnetworkservice.xml
+xml/goutputstream.xml
+xml/gresolver.xml
+xml/gseekable.xml
+xml/gsimpleasyncresult.xml
+xml/gsocketaddress.xml
+xml/gsocketclient.xml
+xml/gsocketconnectable.xml
+xml/gsocketconnection.xml
+xml/gsocketcontrolmessage.xml
+xml/gsocketlistener.xml
+xml/gsocketservice.xml
+xml/gsocket.xml
+xml/gsrvtarget.xml
+xml/gtcpconnection.xml
+xml/gthemedicon.xml
+xml/gthreadedsocketservice.xml
+xml/gunixconnection.xml
+xml/gunixfdmessage.xml
+xml/gunixinputstream.xml
+xml/gunixmounts.xml
+xml/gunixoutputstream.xml
+xml/gunixsocketaddress.xml
+xml/gvfs.xml
+xml/gvolumemonitor.xml
+xml/gvolume.xml
+xml/migrating.xml
+xml/overview.xml
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index e2fce8fbf..d882c01a7 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -1631,6 +1631,7 @@ g_network_service_get_type
 GSocket
 GSocketSourceFunc
 GSocketType
+GSocketProtocol
 GSocketMsgFlags
 GInputVector
 GOutputVector
@@ -1663,11 +1664,9 @@ g_socket_set_keepalive
 g_socket_get_family
 g_socket_get_fd
 g_socket_get_local_address
-g_socket_get_protocol_id
-g_socket_get_protocol_name
+g_socket_get_protocol
 g_socket_get_remote_address
 g_socket_get_socket_type
-g_socket_protocol_id_lookup_by_name
 <SUBSECTION Standard>
 GSocketClass
 G_IS_SOCKET