diff options
| -rw-r--r-- | bindings/vala/examples/Makefile.am | 36 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 15 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml.in | 4 | ||||
| -rw-r--r-- | docs/reference/libappindicator-sections.txt | 1 | ||||
| -rw-r--r-- | example/Makefile.am | 6 | ||||
| -rw-r--r-- | src/AppIndicator3-0.1.metadata.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/app-indicator.h | 2 | ||||
| -rw-r--r-- | src/appindicator3-0.1.pc.in | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
11 files changed, 63 insertions, 20 deletions
diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am index 32a695b..484a00a 100644 --- a/bindings/vala/examples/Makefile.am +++ b/bindings/vala/examples/Makefile.am @@ -1,13 +1,39 @@ +if USE_GTK3 +VER=3 +else +VER= +endif VALAFILES = indicator-example.vala -CLEANFILES = $(TESTS) *.c EXTRA_DIST = $(VALAFILES) -VALAFLAGS = --pkg appindicator-0.1 --vapidir=$(top_builddir)/bindings/vala --save-temps +VALAFLAGS = \ + --pkg appindicator$(VER)-0.1 \ + --vapidir=$(top_builddir)/bindings/vala \ + --save-temps if HAVE_VALAC -indicator-example: $(VALAFILES) Makefile.am - $(VALAC) $(VALAFLAGS) $(srcdir)/$(VALAFILES) -check: indicator-example +BUILT_SOURCES = indicator-example.c + +indicator-example.c: $(VALAFILES) Makefile.am + $(VALAC) $(VALAFLAGS) -C $< -o $@ + $(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@ + +nodist_indicator_example_SOURCES = indicator-example.c +indicator_example_CFLAGS = \ + $(LIBRARY_CFLAGS) \ + -Wall -Werror \ + -I$(top_srcdir)/src \ + -include $(top_srcdir)/src/app-indicator.h +indicator_example_LDADD = \ + $(LIBRARY_LIBS) \ + $(top_builddir)/src/libappindicator$(VER).la + +check_PROGRAMS = indicator-example + +CLEANFILES = \ + *.c \ + indicator-example + endif diff --git a/configure.ac b/configure.ac index 758914b..597a5bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.92, ted@canonical.com) +AC_INIT(libappindicator, 0.2.95, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.92) +AM_INIT_AUTOMAKE(libappindicator, 0.2.95) AM_MAINTAINER_MODE diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index ae23e0b..8f87b34 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -3,18 +3,21 @@ # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 +if USE_GTK3 +VER=3 +APPINDICATORLIB = libappindicator3.la +else +VER= +APPINDICATORLIB = libappindicator.la +endif + # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples # of using the various options. # The name of the module, e.g. 'glib'. -if USE_GTK3 -DOC_MODULE=libappindicator3 -else DOC_MODULE=libappindicator -endif - # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 @@ -96,7 +99,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS) +GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make diff --git a/docs/reference/libappindicator-docs.sgml.in b/docs/reference/libappindicator-docs.sgml.in index 3a8e5de..67c7cc6 100644 --- a/docs/reference/libappindicator-docs.sgml.in +++ b/docs/reference/libappindicator-docs.sgml.in @@ -25,6 +25,10 @@ <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-deprecated"> + <title>Deprecated API Index</title> + <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> </book> diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index 602e8d9..d09c498 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -13,6 +13,7 @@ APP_INDICATOR_SIGNAL_NEW_LABEL APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH APP_INDICATOR_SIGNAL_CONNECTION_CHANGED +APP_INDICATOR_SIGNAL_SCROLL_EVENT AppIndicatorCategory AppIndicatorStatus AppIndicatorPrivate diff --git a/example/Makefile.am b/example/Makefile.am index 606317c..dbea724 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -5,6 +5,7 @@ VER= endif CLEANFILES = +EXTRA_DIST = check_PROGRAMS = \ simple-client \ @@ -27,7 +28,7 @@ simple_client_LDADD = \ $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator$(VER).la -EXTRA_DIST = \ +EXTRA_DIST += \ simple-client-test-icon.png ######################################### @@ -54,3 +55,6 @@ simple_client_vala_LDADD = $(simple_client_LDADD) CLEANFILES += *.stamp *-vala.c endif + +EXTRA_DIST += \ + simple-client-vala.vala diff --git a/src/AppIndicator3-0.1.metadata.in b/src/AppIndicator3-0.1.metadata.in index 5790ddb..8d094fd 100644 --- a/src/AppIndicator3-0.1.metadata.in +++ b/src/AppIndicator3-0.1.metadata.in @@ -1,3 +1,3 @@ -AppIndicator name="AppIndicator" +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/app-indicator.h b/src/app-indicator.h index 0e693bd..9e53447 100644 --- a/src/app-indicator.h +++ b/src/app-indicator.h @@ -176,7 +176,7 @@ typedef struct _AppIndicatorPrivate AppIndicatorPrivate; @new_label: Slot for #AppIndicator::new-label. @new_accessible_desc: Slot for #AppIndicator::new-accessible-desc. @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 diff --git a/tests/Makefile.am b/tests/Makefile.am index ed89981..a65f320 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -153,6 +153,7 @@ HTML_REPORT = libappindicator-check-results.html libappindicator-tests: libappindicator-tests-gtester Makefile.am @echo "#!/bin/bash" > $@ @echo . $(srcdir)/run-xvfb.sh >> $@ + @echo export UBUNTU_MENUPROXY= >> $@ @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ @chmod +x $@ |