[gobject-introspection/wip/transformer: 5/18] tests: Fix namespacing for BarApp (should be just Bar)

[Colin Walters <walters src gnome org>]

commit 688d8c2567ec87b3e5b9450e7894e9d340be4e82
Author: Colin Walters <walters verbum org>
Date:   Wed Aug 18 19:38:05 2010 -0400

    tests: Fix namespacing for BarApp (should be just Bar)

 ...arApp-1.0-expected.gir => Bar-1.0-expected.gir} |    6 +++---
 tests/scanner/Makefile.am                          |   13 ++++++-------
 tests/scanner/barapp.c                             |    4 ++--
 tests/scanner/barapp.h                             |    4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/tests/scanner/BarApp-1.0-expected.gir b/tests/scanner/Bar-1.0-expected.gir
similarity index 89%
rename from tests/scanner/BarApp-1.0-expected.gir
rename to tests/scanner/Bar-1.0-expected.gir
index ca9b7ee..0f665a6 100644
--- a/tests/scanner/BarApp-1.0-expected.gir
+++ b/tests/scanner/Bar-1.0-expected.gir
@@ -9,7 +9,7 @@ and/or use gtk-doc annotations.  -->
   <include name="GLib" version="2.0"/>
   <include name="GObject" version="2.0"/>
   <package name="gobject-2.0"/>
-  <namespace name="BarApp" version="1.0" shared-library="" c:prefix="Bar">
+  <namespace name="Bar" version="1.0" shared-library="" c:prefix="Bar">
     <class name="Baz"
            c:type="BarBaz"
            parent="GObject.Object"
@@ -27,12 +27,12 @@ and/or use gtk-doc annotations.  -->
         <type name="GObject.ObjectClass" c:type="GObjectClass"/>
       </field>
     </record>
-    <function name="func" c:identifier="barapp_func">
+    <function name="app_func" c:identifier="bar_app_func">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <function name="func2" c:identifier="barapp_func2">
+    <function name="app_func2" c:identifier="bar_app_func2">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>
       </return-value>
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 0e11120..17dc88b 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -100,13 +100,12 @@ barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
 barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 
-BarApp-1.0.gir: barapp
-BarApp_1_0_gir_PACKAGES = gobject-2.0
-BarApp_1_0_gir_PROGRAM = ./barapp
-BarApp_1_0_gir_INCLUDES = GObject-2.0
-BarApp_1_0_gir_FILES = $(barapp_SOURCES)
-BarApp_1_0_gir_SCANNERFLAGS = --strip-prefix=Bar
-GIRS += BarApp-1.0.gir
+Bar-1.0.gir: barapp
+Bar_1_0_gir_PACKAGES = gobject-2.0
+Bar_1_0_gir_PROGRAM = ./barapp
+Bar_1_0_gir_INCLUDES = GObject-2.0
+Bar_1_0_gir_FILES = $(barapp_SOURCES)
+GIRS += Bar-1.0.gir
 
 pre-check:
 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
diff --git a/tests/scanner/barapp.c b/tests/scanner/barapp.c
index f2b9254..d336975 100644
--- a/tests/scanner/barapp.c
+++ b/tests/scanner/barapp.c
@@ -16,12 +16,12 @@ bar_baz_init (BarBaz *object)
 }
 
 void
-barapp_func (void)
+bar_app_func (void)
 {
 }
 
 void
-barapp_func2 (int x, double y)
+bar_app_func2 (int x, double y)
 {
 }
 
diff --git a/tests/scanner/barapp.h b/tests/scanner/barapp.h
index 6e09b8a..ff8037d 100644
--- a/tests/scanner/barapp.h
+++ b/tests/scanner/barapp.h
@@ -20,5 +20,5 @@ struct BarBazClass
 
 GType bar_baz_get_type          (void) G_GNUC_CONST;
 
-void barapp_func (void);
-void barapp_func2 (int x, double y);
+void bar_app_func (void);
+void bar_app_func2 (int x, double y);