fix spelling of GHashTable. #561135

	* giscanner/glibtransformer.py (GLibTransformer.__init__): fix
	spelling of GHashTable. #561135

	* tests/scanner/annotation.c (annotation_object_get_hash):
	* tests/scanner/annotation-1.0-expected.gir:
	* tests/scanner/annotation-1.0-expected.tgir: add a test of
	GHashTable annotations

svn path=/trunk/; revision=940

diff --git a/ChangeLog b/ChangeLog
index 2d92847..c3c7333 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-17  Dan Winship  <danw@gnome.org>
+
+       * giscanner/glibtransformer.py (GLibTransformer.__init__): fix
+       spelling of GHashTable. #561135
+
+       * tests/scanner/annotation.c (annotation_object_get_hash):
+       * tests/scanner/annotation-1.0-expected.gir:
+       * tests/scanner/annotation-1.0-expected.tgir: add a test of
+       GHashTable annotations
+
 2008-11-17  Andreas Rottmann  <a.rottmann@gmx.at>
 
        * giscanner/ast.py: Change string array match type to be in terms

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index 2edab36..263f6dc 100644 (file)
--- a/giscanner/glibtransformer.py
+++ b/giscanner/glibtransformer.py
@@ -85,7 +85,7 @@ class GLibTransformer(object):
     def __init__(self, transformer, noclosure=False):
         self._transformer = transformer
         self._transformer.set_container_types(['GList*', 'GSList*'],
-                                              ['GHashtable*'])
+                                              ['GHashTable*'])
         self._namespace_name = None
         self._names = Names()
         self._uscore_type_names = {}

diff --git a/tests/scanner/annotation-1.0-expected.gir b/tests/scanner/annotation-1.0-expected.gir
index 5f8102e..286759c 100644 (file)
--- a/tests/scanner/annotation-1.0-expected.gir
+++ b/tests/scanner/annotation-1.0-expected.gir
@@ -149,6 +149,14 @@
           </type>
         </return-value>
       </method>
+      <method name="get_hash" c:identifier="annotation_object_get_hash">
+        <return-value transfer-ownership="full">
+          <type name="GLib.HashTable" c:type="GHashTable*">
+            <type name="utf8"/>
+            <type name="GObject.Object"/>
+          </type>
+        </return-value>
+      </method>
       <method name="get_objects" c:identifier="annotation_object_get_objects">
         <return-value transfer-ownership="container">
           <type name="GLib.SList" c:type="GSList*">

diff --git a/tests/scanner/annotation-1.0-expected.tgir b/tests/scanner/annotation-1.0-expected.tgir
index 4728f8d..251d0bc 100644 (file)
--- a/tests/scanner/annotation-1.0-expected.tgir
+++ b/tests/scanner/annotation-1.0-expected.tgir
@@ -140,6 +140,14 @@
           </type>
         </return-value>
       </method>
+      <method name="get_hash" c:identifier="annotation_object_get_hash">
+        <return-value transfer-ownership="full">
+          <type name="GLib.HashTable">
+            <type name="utf8"/>
+            <type name="GObject.Object"/>
+          </type>
+        </return-value>
+      </method>
       <method name="get_objects" c:identifier="annotation_object_get_objects">
         <return-value transfer-ownership="container">
           <type name="GLib.SList">

diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index 3a67a01..fafb2a4 100644 (file)
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -161,6 +161,24 @@ annotation_object_get_strings (AnnotationObject *object)
   return list;
 }
 
+/**
+ * annotation_object_get_hash:
+ * @object: a #GObject
+ *
+ * This is a test for returning a hash table mapping strings to
+ * objects.
+ *
+ * Return value: (element-type utf8 GObject): hash table
+ */
+GHashTable*
+annotation_object_get_hash (AnnotationObject *object)
+{
+  GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                           g_free, g_object_unref);
+  g_hash_table_insert (hash, g_strdup ("one"), g_object_ref (object));
+  g_hash_table_insert (hash, g_strdup ("two"), g_object_ref (object));
+  return hash;
+}
 
 /**
  * annotation_object_with_voidp

diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h
index 116b881..d79c309 100644 (file)
--- a/tests/scanner/annotation.h
+++ b/tests/scanner/annotation.h
@@ -55,6 +55,7 @@ gint     annotation_object_calleesowns  (AnnotationObject *object,
                                         GObject          **toown1,
                                         GObject          **toown2);
 GList*   annotation_object_get_strings  (AnnotationObject *object);
+GHashTable*annotation_object_get_hash   (AnnotationObject *object);
 GSList*  annotation_object_get_objects  (AnnotationObject *object);
 
 void     annotation_object_use_buffer   (AnnotationObject *object,