[gnome-panel/gtk3] gir: Require g-i 0.9.5 and stop using deprecated --strip-prefix option

[Vincent Untz <vuntz src gnome org>]

commit 6ffeb295bd712342483a5404987f5a2b2b1c59dc
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jan 31 11:29:46 2011 +0100

    gir: Require g-i 0.9.5 and stop using deprecated --strip-prefix option
    
    We can now use --identifier-prefix and --symbol-prefix with
    g-ir-scanner.

 configure.ac                |    2 +-
 libpanel-applet/Makefile.am |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ac93912..6a43092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
 GNOME_COMPILE_WARNINGS(maximum)
 
 # Check for introspection
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([0.9.5])
 
 m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
 PANEL_INTLTOOL_PANEL_APPLET_RULE='%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index df29704..8a34fdc 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -121,9 +121,7 @@ PanelApplet_4_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GConf-2.0
 PanelApplet_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
 PanelApplet_4_0_gir_LIBS = libpanel-applet-4.la
 PanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
-# When requiring gobject-introspection 0.9.5, use this:
-#PanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libpanelapplet-4.0
-PanelApplet_4_0_gir_SCANNERFLAGS = --strip-prefix=Panel --pkg-export=libpanelapplet-4.0
+PanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libpanelapplet-4.0
 INTROSPECTION_GIRS += PanelApplet-4.0.gir
 
 girdir = $(INTROSPECTION_GIRDIR)