Remove drawable-injected

svn path=/trunk/; revision=1043

diff --git a/tests/scanner/DrawableAdditions.xml b/tests/scanner/DrawableAdditions.xml
deleted file mode 100644 (file)
index 7589a17..0000000
--- a/tests/scanner/DrawableAdditions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<injections xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <inject path="namespace/class[@name='TestDrawable']">
-    <method name="get_width" c:identifier="girepo_test_drawable_get_width">
-      <return-value transfer-ownership="none">
-        <type name="int" c:type="gint"/>
-      </return-value>
-    </method>
-  </inject>
-</injections>

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 3df082d..a3e52db 100644 (file)
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -64,12 +64,6 @@ drawable-1.0.gir: libdrawable.la drawable.c drawable.h utility-1.0.gir $(SCANNER
         --output $@
 GIRS += drawable-1.0.gir
 
-drawable-injected-1.0.gir: drawable-1.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
-       $(CHECK_DEBUG) $(SCANNER) -v \
-        --inject drawable-1.0.gir $(srcdir)/DrawableAdditions.xml $@
-GIRS += drawable-injected-1.0.gir
-EXTRA_DIST += DrawableAdditions.xml
-
 foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
        $(CHECK_DEBUG) $(SCANNER) \
        --include=GObject-2.0 \

diff --git a/tests/scanner/drawable-injected-1.0-expected.gir b/tests/scanner/drawable-injected-1.0-expected.gir
deleted file mode 100644 (file)
index 54c708b..0000000
--- a/tests/scanner/drawable-injected-1.0-expected.gir
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file was automatically generated from C sources - DO NOT EDIT!
-To affect the contents of this file, edit the original C definitions,
-and/or use gtk-doc annotations.  -->
-<repository version="1.0"
-            xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="GLib" version="2.0"/>
-  <include name="GObject" version="2.0"/>
-  <include name="utility" version="1.0"/>
-  <namespace name="drawable" version="1.0" shared-library="drawable">
-    <class name="TestDrawable"
-           c:type="TestDrawable"
-           parent="GObject.Object"
-           abstract="1"
-           glib:type-name="TestDrawable"
-           glib:get-type="test_drawable_get_type">
-      <method name="do_foo" c:identifier="test_drawable_do_foo">
-        <return-value transfer-ownership="none">
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="none">
-            <type name="int" c:type="int"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_origin" c:identifier="test_drawable_get_origin">
-        <return-value transfer-ownership="none">
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" direction="out" transfer-ownership="full">
-            <type name="int" c:type="int*"/>
-          </parameter>
-          <parameter name="y" direction="out" transfer-ownership="full">
-            <type name="int" c:type="int*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="test_drawable_get_size">
-        <return-value transfer-ownership="none">
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="width" direction="out" transfer-ownership="full">
-            <type name="uint" c:type="guint*"/>
-          </parameter>
-          <parameter name="height" direction="out" transfer-ownership="full">
-            <type name="uint" c:type="guint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="do_foo_maybe_throw"
-              c:identifier="test_drawable_do_foo_maybe_throw"
-              throws="1">
-        <return-value transfer-ownership="none">
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="none">
-            <type name="int" c:type="int"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width" c:identifier="girepo_test_drawable_get_width">
-        <return-value transfer-ownership="none">
-          <type name="int" c:type="gint"/>
-        </return-value>
-      </method>
-      <field name="parent_instance">
-        <type name="GObject.Object" c:type="GObject"/>
-      </field>
-    </class>
-    <record name="TestDrawableClass" c:type="TestDrawableClass">
-      <field name="parent_class">
-        <type name="GObject.ObjectClass" c:type="GObjectClass"/>
-      </field>
-    </record>
-    <record name="TestPixmapObjectClass" c:type="_TestPixmapObjectClass">
-      <field name="parent_class">
-        <type name="TestDrawableClass" c:type="TestDrawableClass"/>
-      </field>
-    </record>
-  </namespace>
-</repository>

diff --git a/tests/scanner/drawable-injected-1.0-expected.tgir b/tests/scanner/drawable-injected-1.0-expected.tgir
deleted file mode 100644 (file)
index 4498f79..0000000
--- a/tests/scanner/drawable-injected-1.0-expected.tgir
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<repository version="1.0"
-            xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="utility" version="1.0"/>
-  <include name="GObject" version="2.0"/>
-  <include name="GLib" version="2.0"/>
-  <namespace name="drawable" version="1.0" shared-library="drawable">
-    <class name="TestDrawable" parent="GObject.Object" abstract="1" glib:type-name="TestDrawable" glib:get-type="test_drawable_get_type">
-      <field name="parent_instance">
-        <type name="GObject.Object"/>
-      </field>
-      <method name="do_foo" c:identifier="test_drawable_do_foo">
-        <return-value transfer-ownership="none">
-          <type name="none"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="none">
-            <type name="int"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_origin" c:identifier="test_drawable_get_origin">
-        <return-value transfer-ownership="none">
-          <type name="none"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="full" direction="out">
-            <type name="int"/>
-          </parameter>
-          <parameter name="y" transfer-ownership="full" direction="out">
-            <type name="int"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="test_drawable_get_size">
-        <return-value transfer-ownership="none">
-          <type name="none"/>
-        </return-value>
-        <parameters>
-          <parameter name="width" transfer-ownership="full" direction="out">
-            <type name="uint"/>
-          </parameter>
-          <parameter name="height" transfer-ownership="full" direction="out">
-            <type name="uint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="do_foo_maybe_throw" c:identifier="test_drawable_do_foo_maybe_throw" throws="1">
-        <return-value transfer-ownership="none">
-          <type name="none"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="none">
-            <type name="int"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width" c:identifier="girepo_test_drawable_get_width">
-        <return-value transfer-ownership="none">
-          <type name="int"/>
-        </return-value>
-      </method>
-    </class>
-    <record name="TestDrawableClass">
-      <field name="parent_class">
-        <type name="GObject.ObjectClass"/>
-      </field>
-    </record>
-    <record name="TestPixmapObjectClass">
-      <field name="parent_class">
-        <type name="TestDrawableClass"/>
-      </field>
-    </record>
-  </namespace>
-</repository>