From 56428ae349e0dfaa87925242ccd33806969a47dd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@src.gnome.org>
Date: Fri, 29 Aug 2008 18:19:26 +0000
Subject: [PATCH] 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
---
 girepository/tools/generate.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/girepository/tools/generate.c b/girepository/tools/generate.c
index 02152df3c..40c497b2a 100644
--- a/girepository/tools/generate.c
+++ b/girepository/tools/generate.c
@@ -107,7 +107,7 @@ write_type_info (const gchar *namespace,
   else if (tag == 22)
     {
       type = g_type_info_get_param_type (info, 0);
-      g_fprintf (file, "GList");
+      g_fprintf (file, "GLib.List");
       if (type)
 	{
 	  g_fprintf (file, "<"); 
@@ -119,7 +119,7 @@ write_type_info (const gchar *namespace,
   else if (tag == 23)
     {
       type = g_type_info_get_param_type (info, 0);
-      g_fprintf (file, "GSList");
+      g_fprintf (file, "GLib.SList");
       if (type)
 	{
 	  g_fprintf (file, "<"); 
@@ -131,7 +131,7 @@ write_type_info (const gchar *namespace,
   else if (tag == 24)
     {
       type = g_type_info_get_param_type (info, 0);
-      g_fprintf (file, "GHashTable");
+      g_fprintf (file, "GLib.HashTable");
       if (type)
 	{
 	  g_fprintf (file, "<"); 
@@ -148,7 +148,7 @@ write_type_info (const gchar *namespace,
     {
       gint n;
 
-      g_fprintf (file, "GError");
+      g_fprintf (file, "GLib.Error");
       n = g_type_info_get_n_error_domains (info);
       if (n > 0)
 	{