New upstream release (0.2.95)

∘ Fixing build for GTK2/3 dual build

5 files changed, 20 insertions, 9 deletions

diff --git a/src/AppIndicator3-0.1.metadata.in b/src/AppIndicator3-0.1.metadata.in
new file mode 100644
index 0000000..8d094fd
--- /dev/null
+++ b/src/AppIndicator3-0.1.metadata.in
@@ -0,0 +1,3 @@
+AppIndicator3 name="AppIndicator"
+Indicator.priv hidden="1"
+IndicatorPrivate hidden="1"
diff --git a/src/Makefile.am b/src/Makefile.am
index f83a6c4..8a74d66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,8 @@ BUILT_SOURCES =
 EXTRA_DIST = \
 	appindicator-0.1.pc.in \
 	appindicator3-0.1.pc.in \
-	AppIndicator$(VER)-0.1.metadata.in
+	AppIndicator-0.1.metadata.in \
+	AppIndicator3-0.1.metadata.in
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -44,7 +45,7 @@ glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
 DISTCLEANFILES += app-indicator-enum-types.c
 
 libappindicatorincludefolder=libappindicator
-libappindicatorincludedir=$(includedir)/libappindicator-0.1/$(libappindicatorincludefolder)
+libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/$(libappindicatorincludefolder)
 
 libappindicator_headers = \
 	app-indicator.h
@@ -134,7 +135,8 @@ INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(srcdir) \
 	$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \
 	--symbol-prefix=app \
-	--identifier-prefix=App
+	--identifier-prefix=App \
+	--warn-all
 else
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(srcdir) \
@@ -156,11 +158,13 @@ AppIndicator_0_1_gir_INCLUDES = \
 AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
 AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
 AppIndicator_0_1_gir_FILES = $(introspection_sources)
+# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
 
 AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
 AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
 AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
 AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
+# AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
 
 INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 20885b0..410a3c3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -75,6 +75,7 @@ DIST_COMMON = $(libappindicator3include_HEADERS) \
 	$(srcdir)/appindicator3-0.1.pc.in \
 	$(top_srcdir)/Makefile.am.enum \
 	$(top_srcdir)/Makefile.am.marshal
+# AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
 @HAVE_INTROSPECTION_TRUE@am__append_1 = AppIndicator$(VER)-0.1.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = AppIndicator$(VER)-0.1.metadata
 @HAVE_INTROSPECTION_TRUE@am__append_3 =  \
@@ -376,8 +377,9 @@ BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \
 	gen-notification-item.xml.h gen-notification-watcher.xml.c \
 	gen-notification-watcher.xml.h $(am__append_2)
 EXTRA_DIST = appindicator-0.1.pc.in appindicator3-0.1.pc.in \
-	AppIndicator$(VER)-0.1.metadata.in $(enum_tmpl_h) \
-	$(enum_tmpl_c) $(glib_marshal_list) $(DBUS_SPECS)
+	AppIndicator-0.1.metadata.in AppIndicator3-0.1.metadata.in \
+	$(enum_tmpl_h) $(enum_tmpl_c) $(glib_marshal_list) \
+	$(DBUS_SPECS)
 enum_tmpl_h = $(glib_enum_h:.h=.h.in)
 enum_tmpl_c = $(glib_enum_c:.c=.c.in)
 marshal_h = $(glib_marshal_list:.list=.h)
@@ -394,7 +396,7 @@ glib_enum_h = app-indicator-enum-types.h
 glib_enum_c = app-indicator-enum-types.c
 glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
 libappindicatorincludefolder = libappindicator
-libappindicatorincludedir = $(includedir)/libappindicator-0.1/$(libappindicatorincludefolder)
+libappindicatorincludedir = $(includedir)/libappindicator$(VER)-0.1/$(libappindicatorincludefolder)
 libappindicator_headers = \
 	app-indicator.h
 
@@ -456,7 +458,8 @@ INTROSPECTION_GIRS = $(am__append_1)
 @INTROSPECTION_TEN_TRUE@	--add-include-path=$(srcdir) \
 @INTROSPECTION_TEN_TRUE@	$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \
 @INTROSPECTION_TEN_TRUE@	--symbol-prefix=app \
-@INTROSPECTION_TEN_TRUE@	--identifier-prefix=App
+@INTROSPECTION_TEN_TRUE@	--identifier-prefix=App \
+@INTROSPECTION_TEN_TRUE@	--warn-all
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 @HAVE_INTROSPECTION_TRUE@introspection_sources = \
@@ -469,6 +472,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 @HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
 @HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
 @HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_FILES = $(introspection_sources)
+# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
 @HAVE_INTROSPECTION_TRUE@AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
 @HAVE_INTROSPECTION_TRUE@AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
 @HAVE_INTROSPECTION_TRUE@AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 2a30b22..3fdee86 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -169,7 +169,7 @@ typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
 	@new_icon_theme_path: Slot for #AppIndicator::new-icon-theme-path
 	@new_label: Slot for #AppIndicator::new-label.
 	@connection_changed: Slot for #AppIndicator::connection-changed.
-	@scroll-event: Slot for #AppIndicator::scroll-event
+	@scroll_event: Slot for #AppIndicator::scroll-event
 	@app_indicator_reserved_ats: Reserved for future use.
 	@fallback: Function that gets called to make a #GtkStatusIcon when
 		there is no Application Indicator area available.
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
index 0ffe409..f59ac70 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libappindicator-0.1
+Cflags: -I${includedir}/libappindicator3-0.1
 Requires: dbusmenu-glib-0.4 gtk+-3.0
 Libs: -L${libdir} -lappindicator3