gir-repository r140 - trunk/gir

[walters svn gnome org]

Author: walters
Date: Mon Oct 20 16:51:56 2008
New Revision: 140
URL: http://svn.gnome.org/viewvc/gir-repository?rev=140&view=rev

Log:
Bug 556889 - Rename ClutterGtk to GtkClutter


Added:
   trunk/gir/Clutter-0.8.xpath
Modified:
   trunk/gir/Makefile.am

Added: trunk/gir/Clutter-0.8.xpath
==============================================================================
--- (empty file)
+++ trunk/gir/Clutter-0.8.xpath	Mon Oct 20 16:51:56 2008
@@ -0,0 +1 @@
+/namespace/class[ name='Model']/method[ name='insertv']/parameters/parameter[ name='columns']/array/type[ name='uint']

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 20 16:51:56 2008
@@ -403,13 +403,15 @@
 	     $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
 	$(G_IR_SCANNER) --inject $@ ClutterAdditions.xml $@
 BUILT_GIRSOURCES += Clutter-0.8.gir ClutterJson-0.8.gir
+XPATH_TESTS += Clutter-0.8.xpath
 endif BUILD_CLUTTER
 
 if BUILD_CLUTTERGTK
 CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
 CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.8`
-ClutterGtk-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir $(G_IR_SCANNER)
-	$(G_IR_SCANNER) -v --namespace ClutterGtk --nsversion=0.8 \
+# This one is called GtkClutter because it matches the C naming
+GtkClutter-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace GtkClutter --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GL-1.0 \
              --include=GObject-2.0 \
@@ -423,7 +425,7 @@
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
-BUILT_GIRSOURCES += ClutterGtk-0.8.gir
+BUILT_GIRSOURCES += GtkClutter-0.8.gir
 endif BUILD_CLUTTERGTK
 
 if BUILD_CLUTTERCAIRO