From 7633eacefb4cacbb8243bb06436e156cc2087224 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Thu, 14 Feb 2013 01:16:47 -0800 Subject: [PATCH] introspection: fix symbol-prefix passed to g-ir-scanner The symbol-prefix should not have a trailing underscore. Leaving it as it currently is causes problems for Vala, which is currently the only software to actually use the symbol-prefix from the GIR. --- lib/packagekit-glib2/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/packagekit-glib2/Makefile.am b/lib/packagekit-glib2/Makefile.am index 504418b..da9c02e 100644 --- a/lib/packagekit-glib2/Makefile.am +++ b/lib/packagekit-glib2/Makefile.am @@ -266,7 +266,7 @@ PackageKitGlib-1.0.gir: libpackagekit-glib2.la PackageKitGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 PackageKitGlib_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Pk \ - --symbol-prefix=pk_ \ + --symbol-prefix=pk \ --warn-all \ --add-include-path=$(srcdir) \ --c-include="packagekit-glib2/packagekit.h" diff --git a/src/Makefile.am b/src/Makefile.am index 19620c6..863b025 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -263,7 +263,7 @@ PackageKitPlugin_1_0_gir_CFLAGS = $(AM_CPPFLAGS) \ -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \ -DI_KNOW_THE_PACKAGEKIT_PLUGIN_API_IS_SUBJECT_TO_CHANGE PackageKitPlugin_1_0_gir_SCANNERFLAGS = --identifier-prefix=Pk \ - --symbol-prefix=pk_ \ + --symbol-prefix=pk \ --warn-all \ --include-uninstalled=$(top_builddir)/lib/packagekit-glib2/PackageKitGlib-1.0.gir \ --add-include-path=$(srcdir) \ -- 1.8.1.2