mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-22 08:58:54 +02:00
Correctly handle GLib.List, GLib.Error etc
* girepository/girparser.c: Accept both List (for compiling GLib) and GLib.List (what the scanner generates). * tests/ - Update. * tools/generate.c: Generate canonical form. svn path=/trunk/; revision=522
This commit is contained in:
committed by
Philip Withnall
parent
97e04b2b5d
commit
56428ae349
@@ -107,7 +107,7 @@ write_type_info (const gchar *namespace,
|
|||||||
else if (tag == 22)
|
else if (tag == 22)
|
||||||
{
|
{
|
||||||
type = g_type_info_get_param_type (info, 0);
|
type = g_type_info_get_param_type (info, 0);
|
||||||
g_fprintf (file, "GList");
|
g_fprintf (file, "GLib.List");
|
||||||
if (type)
|
if (type)
|
||||||
{
|
{
|
||||||
g_fprintf (file, "<");
|
g_fprintf (file, "<");
|
||||||
@@ -119,7 +119,7 @@ write_type_info (const gchar *namespace,
|
|||||||
else if (tag == 23)
|
else if (tag == 23)
|
||||||
{
|
{
|
||||||
type = g_type_info_get_param_type (info, 0);
|
type = g_type_info_get_param_type (info, 0);
|
||||||
g_fprintf (file, "GSList");
|
g_fprintf (file, "GLib.SList");
|
||||||
if (type)
|
if (type)
|
||||||
{
|
{
|
||||||
g_fprintf (file, "<");
|
g_fprintf (file, "<");
|
||||||
@@ -131,7 +131,7 @@ write_type_info (const gchar *namespace,
|
|||||||
else if (tag == 24)
|
else if (tag == 24)
|
||||||
{
|
{
|
||||||
type = g_type_info_get_param_type (info, 0);
|
type = g_type_info_get_param_type (info, 0);
|
||||||
g_fprintf (file, "GHashTable");
|
g_fprintf (file, "GLib.HashTable");
|
||||||
if (type)
|
if (type)
|
||||||
{
|
{
|
||||||
g_fprintf (file, "<");
|
g_fprintf (file, "<");
|
||||||
@@ -148,7 +148,7 @@ write_type_info (const gchar *namespace,
|
|||||||
{
|
{
|
||||||
gint n;
|
gint n;
|
||||||
|
|
||||||
g_fprintf (file, "GError");
|
g_fprintf (file, "GLib.Error");
|
||||||
n = g_type_info_get_n_error_domains (info);
|
n = g_type_info_get_n_error_domains (info);
|
||||||
if (n > 0)
|
if (n > 0)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user