Index: vapigen/valagidlparser.vala =================================================================== --- vapigen/valagidlparser.vala (revision 579) +++ vapigen/valagidlparser.vala (working copy) @@ -137,7 +137,7 @@ private string! fix_type_name (string! type_name, IdlModule! module) { if (type_name.has_prefix (module.name)) { return type_name.offset (module.name.len ()); - } else if (module.name == "GLib" && type_name.has_prefix ("G")) { + } else if ((module.name == "GLib" || module.name == "GNet") && type_name.has_prefix ("G")) { return type_name.offset (1); } return type_name; @@ -899,6 +899,25 @@ } else if (n.has_prefix (current_namespace.name)) { type.namespace_name = current_namespace.name; type.type_name = n.offset (current_namespace.name.len ()); + } else if (current_namespace.name == "GNet" && + (n.has_prefix("GConn") == true || n == "GURI" || n == "GTcpSocket" || n == "GUdpSocket" || + n == "GUnixSocket" || n == "GInetAddr" || + n == "GMcastSocket" || n == "GSHA" || + n == "GTcpSocketConnectAsyncStatus" || n == "GConnHttpMethod" || + n.has_prefix("GInetAddr") == true || n.has_prefix("GTcpSocket") == true || + n.has_prefix("GServer") == true) + ) { + if (n == "GTcpSocketConnectAsyncID" || n == "GTcpSocketNewAsyncID" || + n == "GInetAddrNewAsyncID" || n == "GInetAddrGetNameAsyncID" || + n == "GInetAddrNewListAsyncID") + { + type.type_name = "pointer"; + } + else + { + type.namespace_name = current_namespace.name; + type.type_name = n.offset (1); + } } else if (n.has_prefix ("G")) { type.namespace_name = "GLib"; type.type_name = n.offset (1);