diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-10 22:24:39 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-10 22:24:39 -0600 |
| commit | 596f48a0a0c29e683fb31bc837ff54b1b8ca7343 (patch) | |
| tree | fa316218b3d5af4864968b01c1b957189fd562e8 | |
| parent | 2c23d4b9534eacfae055b67c15fe3a254a2928fd (diff) | |
| parent | 1c384cdf7e601e3786fc1add31d157c0eafa1539 (diff) | |
| download | libayatana-appindicator-596f48a0a0c29e683fb31bc837ff54b1b8ca7343.tar.gz libayatana-appindicator-596f48a0a0c29e683fb31bc837ff54b1b8ca7343.tar.bz2 libayatana-appindicator-596f48a0a0c29e683fb31bc837ff54b1b8ca7343.zip | |
Import upstream version 0.2.95
29 files changed, 422 insertions, 75 deletions
@@ -2,6 +2,54 @@ 2011-02-10 Ted Gould <ted@gould.cx> + 0.2.95 + +2011-02-10 Ted Gould <ted@gould.cx> + + Fix the build so we can distcheck with GTK 2 and 3 + +2011-02-10 Ted Gould <ted@gould.cx> + + Blocking the menu proxy from our test + +2011-02-10 Ted Gould <ted@gould.cx> + + Changing the build so that it uses the right version of the vala files and removes the predefined header location + +2011-02-10 Ted Gould <ted@gould.cx> + + Changing the install path of the headers for libappindicator GTK3 version so it's parrallel installable + +2011-02-10 Ted Gould <ted@gould.cx> + + Adjusting the name of the different namespace with GTK 3 + +2011-02-10 Ted Gould <ted@gould.cx> + + Ensure that we're building with the right library + +2011-02-10 Ted Gould <ted@gould.cx> + + Cleanup what we create + +2011-02-10 Ted Gould <ted@gould.cx> + + gtk-doc wants a deprecated section now + +2011-02-10 Ted Gould <ted@gould.cx> + + Removing the multiple modules as we shouldn't need them + +2011-02-10 Ted Gould <ted@gould.cx> + + Fixing scroll documentation + +2011-02-10 Ted Gould <ted@gould.cx> + + Making sure to pick up both metadata files in dist. + +2011-02-10 Ted Gould <ted@gould.cx> + 0.2.94 2011-02-10 Ted Gould <ted@gould.cx> 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/bindings/vala/examples/Makefile.in b/bindings/vala/examples/Makefile.in index 3f1ff93..f4a0c3f 100644 --- a/bindings/vala/examples/Makefile.in +++ b/bindings/vala/examples/Makefile.in @@ -33,6 +33,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_VALAC_TRUE@check_PROGRAMS = indicator-example$(EXEEXT) subdir = bindings/vala/examples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -44,14 +45,49 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +@HAVE_VALAC_TRUE@nodist_indicator_example_OBJECTS = indicator_example-indicator-example.$(OBJEXT) +indicator_example_OBJECTS = $(nodist_indicator_example_OBJECTS) +am__DEPENDENCIES_1 = +@HAVE_VALAC_TRUE@indicator_example_DEPENDENCIES = \ +@HAVE_VALAC_TRUE@ $(am__DEPENDENCIES_1) \ +@HAVE_VALAC_TRUE@ $(top_builddir)/src/libappindicator$(VER).la +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +indicator_example_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(indicator_example_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; AM_V_at = $(am__v_at_$(V)) am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ -SOURCES = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(nodist_indicator_example_SOURCES) DIST_SOURCES = +ETAGS = etags +CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AL = @AL@ @@ -221,13 +257,36 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 VALAFILES = indicator-example.vala -CLEANFILES = $(TESTS) *.c EXTRA_DIST = $(VALAFILES) -VALAFLAGS = --pkg appindicator-0.1 --vapidir=$(top_builddir)/bindings/vala --save-temps -all: all-am +VALAFLAGS = \ + --pkg appindicator$(VER)-0.1 \ + --vapidir=$(top_builddir)/bindings/vala \ + --save-temps + +@HAVE_VALAC_TRUE@BUILT_SOURCES = indicator-example.c +@HAVE_VALAC_TRUE@nodist_indicator_example_SOURCES = indicator-example.c +@HAVE_VALAC_TRUE@indicator_example_CFLAGS = \ +@HAVE_VALAC_TRUE@ $(LIBRARY_CFLAGS) \ +@HAVE_VALAC_TRUE@ -Wall -Werror \ +@HAVE_VALAC_TRUE@ -I$(top_srcdir)/src \ +@HAVE_VALAC_TRUE@ -include $(top_srcdir)/src/app-indicator.h + +@HAVE_VALAC_TRUE@indicator_example_LDADD = \ +@HAVE_VALAC_TRUE@ $(LIBRARY_LIBS) \ +@HAVE_VALAC_TRUE@ $(top_builddir)/src/libappindicator$(VER).la + +@HAVE_VALAC_TRUE@CLEANFILES = \ +@HAVE_VALAC_TRUE@ *.c \ +@HAVE_VALAC_TRUE@ indicator-example + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: +.SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -259,17 +318,123 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +indicator-example$(EXEEXT): $(indicator_example_OBJECTS) $(indicator_example_DEPENDENCIES) + @rm -f indicator-example$(EXEEXT) + $(AM_V_CCLD)$(indicator_example_LINK) $(indicator_example_OBJECTS) $(indicator_example_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_example-indicator-example.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +indicator_example-indicator-example.o: indicator-example.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_example_CFLAGS) $(CFLAGS) -MT indicator_example-indicator-example.o -MD -MP -MF $(DEPDIR)/indicator_example-indicator-example.Tpo -c -o indicator_example-indicator-example.o `test -f 'indicator-example.c' || echo '$(srcdir)/'`indicator-example.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_example-indicator-example.Tpo $(DEPDIR)/indicator_example-indicator-example.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-example.c' object='indicator_example-indicator-example.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_example_CFLAGS) $(CFLAGS) -c -o indicator_example-indicator-example.o `test -f 'indicator-example.c' || echo '$(srcdir)/'`indicator-example.c + +indicator_example-indicator-example.obj: indicator-example.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_example_CFLAGS) $(CFLAGS) -MT indicator_example-indicator-example.obj -MD -MP -MF $(DEPDIR)/indicator_example-indicator-example.Tpo -c -o indicator_example-indicator-example.obj `if test -f 'indicator-example.c'; then $(CYGPATH_W) 'indicator-example.c'; else $(CYGPATH_W) '$(srcdir)/indicator-example.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_example-indicator-example.Tpo $(DEPDIR)/indicator_example-indicator-example.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-example.c' object='indicator_example-indicator-example.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_example_CFLAGS) $(CFLAGS) -c -o indicator_example-indicator-example.obj `if test -f 'indicator-example.c'; then $(CYGPATH_W) 'indicator-example.c'; else $(CYGPATH_W) '$(srcdir)/indicator-example.c'; fi` + mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi ctags: CTAGS -CTAGS: - +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -302,10 +467,13 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -331,13 +499,17 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -380,12 +552,14 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf: pdf-am @@ -397,24 +571,26 @@ ps-am: uninstall-am: -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -@HAVE_VALAC_TRUE@indicator-example: $(VALAFILES) Makefile.am -@HAVE_VALAC_TRUE@ $(VALAC) $(VALAFLAGS) $(srcdir)/$(VALAFILES) - -@HAVE_VALAC_TRUE@check: indicator-example +.MAKE: all check check-am install install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am + + +@HAVE_VALAC_TRUE@indicator-example.c: $(VALAFILES) Makefile.am +@HAVE_VALAC_TRUE@ $(VALAC) $(VALAFLAGS) -C $< -o $@ +@HAVE_VALAC_TRUE@ $(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for libappindicator 0.2.94. +# Generated by GNU Autoconf 2.67 for libappindicator 0.2.95. # # Report bugs to <ted@canonical.com>. # @@ -763,8 +763,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libappindicator' PACKAGE_TARNAME='libappindicator' -PACKAGE_VERSION='0.2.94' -PACKAGE_STRING='libappindicator 0.2.94' +PACKAGE_VERSION='0.2.95' +PACKAGE_STRING='libappindicator 0.2.95' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -1581,7 +1581,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libappindicator 0.2.94 to adapt to many kinds of systems. +\`configure' configures libappindicator 0.2.95 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1651,7 +1651,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libappindicator 0.2.94:";; + short | recursive ) echo "Configuration of libappindicator 0.2.95:";; esac cat <<\_ACEOF @@ -1793,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libappindicator configure 0.2.94 +libappindicator configure 0.2.95 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2073,7 +2073,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libappindicator $as_me 0.2.94, which was +It was created by libappindicator $as_me 0.2.95, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2894,7 +2894,7 @@ fi # Define the identity of the package. PACKAGE=libappindicator - VERSION=0.2.94 + VERSION=0.2.95 cat >>confdefs.h <<_ACEOF @@ -14120,7 +14120,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libappindicator $as_me 0.2.94, which was +This file was extended by libappindicator $as_me 0.2.95, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14186,7 +14186,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libappindicator config.status 0.2.94 +libappindicator config.status 0.2.95 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 12fcb74..597a5bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.94, 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.94) +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/Makefile.in b/docs/reference/Makefile.in index 68ce90e..2d17083 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -234,7 +234,10 @@ top_srcdir = @top_srcdir@ # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 -@USE_GTK3_FALSE@DOC_MODULE = libappindicator +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 +@USE_GTK3_FALSE@APPINDICATORLIB = libappindicator.la +@USE_GTK3_TRUE@APPINDICATORLIB = libappindicator3.la # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to @@ -242,7 +245,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -@USE_GTK3_TRUE@DOC_MODULE = libappindicator3 +DOC_MODULE = libappindicator # Uncomment for versioned docs and specify the version of the module, e.g. '2'. #DOC_MODULE_VERSION=2 @@ -324,7 +327,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) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) diff --git a/docs/reference/html/api-index-deprecated.html b/docs/reference/html/api-index-deprecated.html new file mode 100644 index 0000000..9f719b9 --- /dev/null +++ b/docs/reference/html/api-index-deprecated.html @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Deprecated API Index</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> +<link rel="home" href="index.html" title="libappindicator Reference Manual"> +<link rel="up" href="index.html" title="libappindicator Reference Manual"> +<link rel="prev" href="api-index-full.html" title="API Index"> +<meta name="generator" content="GTK-Doc V1.16 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> +<td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td> </td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">libappindicator Reference Manual</th> +<td> </td> +</tr></table> +<div class="index"> +<div class="titlepage"><div><div><h2 class="title"> +<a name="api-index-deprecated"></a>Deprecated API Index</h2></div></div></div> +<a name="idx"></a> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.16</div> +</body> +</html>
\ No newline at end of file diff --git a/docs/reference/html/api-index-full.html b/docs/reference/html/api-index-full.html index c502c09..69321b8 100644 --- a/docs/reference/html/api-index-full.html +++ b/docs/reference/html/api-index-full.html @@ -7,6 +7,7 @@ <link rel="home" href="index.html" title="libappindicator Reference Manual"> <link rel="up" href="index.html" title="libappindicator Reference Manual"> <link rel="prev" href="object-tree.html" title="Object Hierarchy"> +<link rel="next" href="api-index-deprecated.html" title="Deprecated API Index"> <meta name="generator" content="GTK-Doc V1.16 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -17,7 +18,7 @@ <td> </td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libappindicator Reference Manual</th> -<td> </td> +<td><a accesskey="n" href="api-index-deprecated.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#idxI">I</a></td></tr> </table> @@ -238,6 +239,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS" title="APP_INDICATOR_SIGNAL_SCROLL_EVENT">APP_INDICATOR_SIGNAL_SCROLL_EVENT</a>, macro in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">app-indicator</a> +</dt> +<dd></dd> +<dt> <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-TYPE:CAPS" title="APP_INDICATOR_TYPE">APP_INDICATOR_TYPE</a>, macro in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">app-indicator</a> </dt> <dd></dd> diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html index a07db28..43af9ab 100644 --- a/docs/reference/html/ch01.html +++ b/docs/reference/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id456819"></a>Base Classes for Applications</h2></div></div></div> +<a name="id539114"></a>Base Classes for Applications</h2></div></div></div> <div class="toc"><dl><dt> <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information into the panel.</span> diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index addc62c..cd87fd4 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libappindicator Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libappindicator 0.2.93 + for libappindicator 0.2.95 </p></div> </div> <hr> @@ -28,6 +28,7 @@ </dt></dl></dd> <dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt> <dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt> +<dt><span class="index"><a href="api-index-deprecated.html">Deprecated API Index</a></span></dt> </dl></div> </div> <div class="footer"> diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml index 03e5962..a2dc5a5 100644 --- a/docs/reference/html/index.sgml +++ b/docs/reference/html/index.sgml @@ -19,6 +19,7 @@ <ANCHOR id="APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS"> <ANCHOR id="APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS"> <ANCHOR id="APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS"> +<ANCHOR id="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"> <ANCHOR id="AppIndicatorCategory" href="libappindicator/libappindicator-app-indicator.html#AppIndicatorCategory"> <ANCHOR id="APP-INDICATOR-CATEGORY-APPLICATION-STATUS:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-CATEGORY-APPLICATION-STATUS:CAPS"> <ANCHOR id="APP-INDICATOR-CATEGORY-COMMUNICATIONS:CAPS" href="libappindicator/libappindicator-app-indicator.html#APP-INDICATOR-CATEGORY-COMMUNICATIONS:CAPS"> diff --git a/docs/reference/html/libappindicator-app-indicator.html b/docs/reference/html/libappindicator-app-indicator.html index f229c14..93193b9 100644 --- a/docs/reference/html/libappindicator-app-indicator.html +++ b/docs/reference/html/libappindicator-app-indicator.html @@ -63,6 +63,7 @@ Unstable, unless otherwise indicated #define <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS" title="APP_INDICATOR_SIGNAL_NEW_LABEL">APP_INDICATOR_SIGNAL_NEW_LABEL</a> #define <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS" title="APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH">APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH</a> #define <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS" title="APP_INDICATOR_SIGNAL_CONNECTION_CHANGED">APP_INDICATOR_SIGNAL_CONNECTION_CHANGED</a> +#define <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS" title="APP_INDICATOR_SIGNAL_SCROLL_EVENT">APP_INDICATOR_SIGNAL_SCROLL_EVENT</a> enum <a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory">AppIndicatorCategory</a>; enum <a class="link" href="libappindicator-app-indicator.html#AppIndicatorStatus" title="enum AppIndicatorStatus">AppIndicatorStatus</a>; <a class="link" href="libappindicator-app-indicator.html#AppIndicatorPrivate" title="AppIndicatorPrivate">AppIndicatorPrivate</a>; @@ -306,6 +307,15 @@ String identifier for the <a class="link" href="libappindicator-app-indicator.ht </div> <hr> <div class="refsect2"> +<a name="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"></a><h3>APP_INDICATOR_SIGNAL_SCROLL_EVENT</h3> +<pre class="programlisting">#define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" +</pre> +<p> +String identifier for the <a class="link" href="libappindicator-app-indicator.html#AppIndicator-scroll-event" title='The "scroll-event" signal'><span class="type">"scroll-event"</span></a> signal. +</p> +</div> +<hr> +<div class="refsect2"> <a name="AppIndicatorCategory"></a><h3>enum AppIndicatorCategory</h3> <pre class="programlisting">typedef enum { /*< prefix=APP_INDICATOR_CATEGORY >*/ APP_INDICATOR_CATEGORY_APPLICATION_STATUS, /*< nick=ApplicationStatus >*/ @@ -493,7 +503,8 @@ The signals and external functions that make up the <a class="link" href="libapp </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="AppIndicatorClass.scroll-event"></a>scroll_event</code></em> ()</span></p></td> -<td></td> +<td>Slot for <a class="link" href="libappindicator-app-indicator.html#AppIndicator-scroll-event" title='The "scroll-event" signal'><span class="type">"scroll-event"</span></a> +</td> </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="AppIndicatorClass.app-indicator-reserved-ats"></a>app_indicator_reserved_ats</code></em> ()</span></p></td> diff --git a/docs/reference/html/libappindicator.devhelp b/docs/reference/html/libappindicator.devhelp index 593c4d5..a695026 100644 --- a/docs/reference/html/libappindicator.devhelp +++ b/docs/reference/html/libappindicator.devhelp @@ -7,6 +7,7 @@ </sub> <sub name="Object Hierarchy" link="object-tree.html"/> <sub name="API Index" link="api-index-full.html"/> + <sub name="Deprecated API Index" link="api-index-deprecated.html"/> </chapters> <functions> <function name="APP_INDICATOR_TYPE" link="libappindicator-app-indicator.html#APP-INDICATOR-TYPE:CAPS"/> @@ -21,6 +22,7 @@ <function name="APP_INDICATOR_SIGNAL_NEW_LABEL" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS"/> <function name="APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS"/> <function name="APP_INDICATOR_SIGNAL_CONNECTION_CHANGED" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS"/> + <function name="APP_INDICATOR_SIGNAL_SCROLL_EVENT" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"/> <function name="enum AppIndicatorCategory" link="libappindicator-app-indicator.html#AppIndicatorCategory"/> <function name="enum AppIndicatorStatus" link="libappindicator-app-indicator.html#AppIndicatorStatus"/> <function name="AppIndicatorPrivate" link="libappindicator-app-indicator.html#AppIndicatorPrivate"/> diff --git a/docs/reference/html/libappindicator.devhelp2 b/docs/reference/html/libappindicator.devhelp2 index 52a12d7..d6b0066 100644 --- a/docs/reference/html/libappindicator.devhelp2 +++ b/docs/reference/html/libappindicator.devhelp2 @@ -7,6 +7,7 @@ </sub> <sub name="Object Hierarchy" link="object-tree.html"/> <sub name="API Index" link="api-index-full.html"/> + <sub name="Deprecated API Index" link="api-index-deprecated.html"/> </chapters> <functions> <keyword type="macro" name="APP_INDICATOR_TYPE" link="libappindicator-app-indicator.html#APP-INDICATOR-TYPE:CAPS"/> @@ -21,6 +22,7 @@ <keyword type="macro" name="APP_INDICATOR_SIGNAL_NEW_LABEL" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS"/> <keyword type="macro" name="APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS"/> <keyword type="macro" name="APP_INDICATOR_SIGNAL_CONNECTION_CHANGED" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS"/> + <keyword type="macro" name="APP_INDICATOR_SIGNAL_SCROLL_EVENT" link="libappindicator-app-indicator.html#APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"/> <keyword type="enum" name="enum AppIndicatorCategory" link="libappindicator-app-indicator.html#AppIndicatorCategory"/> <keyword type="enum" name="enum AppIndicatorStatus" link="libappindicator-app-indicator.html#AppIndicatorStatus"/> <keyword type="struct" name="AppIndicatorPrivate" link="libappindicator-app-indicator.html#AppIndicatorPrivate"/> diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index 7c5fc38..4a29d2b 100644 --- a/docs/reference/libappindicator-docs.sgml +++ b/docs/reference/libappindicator-docs.sgml @@ -8,7 +8,7 @@ <bookinfo> <title>libappindicator Reference Manual</title> <releaseinfo> - for libappindicator 0.2.94 + for libappindicator 0.2.95 </releaseinfo> </bookinfo> @@ -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-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 41ff7fa..536e355 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -12,6 +12,7 @@ APP_INDICATOR_SIGNAL_NEW_STATUS APP_INDICATOR_SIGNAL_NEW_LABEL APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH APP_INDICATOR_SIGNAL_CONNECTION_CHANGED +APP_INDICATOR_SIGNAL_SCROLL_EVENT AppIndicatorCategory AppIndicatorStatus AppIndicatorPrivate diff --git a/docs/reference/tmpl/app-indicator.sgml b/docs/reference/tmpl/app-indicator.sgml index 1f102ef..1027d41 100644 --- a/docs/reference/tmpl/app-indicator.sgml +++ b/docs/reference/tmpl/app-indicator.sgml @@ -109,6 +109,13 @@ AppIndicator +<!-- ##### MACRO APP_INDICATOR_SIGNAL_SCROLL_EVENT ##### --> +<para> + +</para> + + + <!-- ##### ENUM AppIndicatorCategory ##### --> <para> diff --git a/docs/reference/version.xml b/docs/reference/version.xml index cd47fa2..7ed9fbf 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.94 +0.2.95 diff --git a/docs/reference/xml/api-index-full.xml b/docs/reference/xml/api-index-full.xml index 0108a0a..a187a94 100644 --- a/docs/reference/xml/api-index-full.xml +++ b/docs/reference/xml/api-index-full.xml @@ -59,6 +59,7 @@ <indexentry><primaryie linkends="APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS"><link linkend="APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS">APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS"><link linkend="APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS">APP_INDICATOR_SIGNAL_NEW_LABEL</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="APP-INDICATOR-SIGNAL-NEW-STATUS:CAPS"><link linkend="APP-INDICATOR-SIGNAL-NEW-STATUS:CAPS">APP_INDICATOR_SIGNAL_NEW_STATUS</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> +<indexentry><primaryie linkends="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"><link linkend="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS">APP_INDICATOR_SIGNAL_SCROLL_EVENT</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="APP-INDICATOR-TYPE:CAPS"><link linkend="APP-INDICATOR-TYPE:CAPS">APP_INDICATOR_TYPE</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="IS-APP-INDICATOR:CAPS"><link linkend="IS-APP-INDICATOR:CAPS">IS_APP_INDICATOR</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="IS-APP-INDICATOR-CLASS:CAPS"><link linkend="IS-APP-INDICATOR-CLASS:CAPS">IS_APP_INDICATOR_CLASS</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> diff --git a/docs/reference/xml/app-indicator.xml b/docs/reference/xml/app-indicator.xml index 3046b42..c83b31d 100644 --- a/docs/reference/xml/app-indicator.xml +++ b/docs/reference/xml/app-indicator.xml @@ -40,6 +40,7 @@ Unstable, unless otherwise indicated #define <link linkend="APP-INDICATOR-SIGNAL-NEW-LABEL:CAPS">APP_INDICATOR_SIGNAL_NEW_LABEL</link> #define <link linkend="APP-INDICATOR-SIGNAL-NEW-ICON-THEME-PATH:CAPS">APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH</link> #define <link linkend="APP-INDICATOR-SIGNAL-CONNECTION-CHANGED:CAPS">APP_INDICATOR_SIGNAL_CONNECTION_CHANGED</link> +#define <link linkend="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS">APP_INDICATOR_SIGNAL_SCROLL_EVENT</link> enum <link linkend="AppIndicatorCategory">AppIndicatorCategory</link>; enum <link linkend="AppIndicatorStatus">AppIndicatorStatus</link>; <link linkend="AppIndicatorPrivate">AppIndicatorPrivate</link>; @@ -250,6 +251,14 @@ String identifier for the <link linkend="AppIndicator-new-icon-theme-path"><type <para> String identifier for the <link linkend="AppIndicator-connection-changed"><type>"connection-changed"</type></link> signal. </para></refsect2> +<refsect2 id="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS" role="macro"> +<title>APP_INDICATOR_SIGNAL_SCROLL_EVENT</title> +<indexterm zone="APP-INDICATOR-SIGNAL-SCROLL-EVENT:CAPS"><primary>APP_INDICATOR_SIGNAL_SCROLL_EVENT</primary></indexterm> +<programlisting>#define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" +</programlisting> +<para> +String identifier for the <link linkend="AppIndicator-scroll-event"><type>"scroll-event"</type></link> signal. +</para></refsect2> <refsect2 id="AppIndicatorCategory" role="enum"> <title>enum AppIndicatorCategory</title> <indexterm zone="AppIndicatorCategory"><primary>AppIndicatorCategory</primary></indexterm> @@ -415,7 +424,7 @@ The signals and external functions that make up the <link linkend="AppIndicator" <listitem><simpara>Slot for <link linkend="AppIndicator-connection-changed"><type>"connection-changed"</type></link>.</simpara></listitem> </varlistentry> <varlistentry><term><structfield id="AppIndicatorClass.scroll-event">scroll_event</structfield> ()</term> -<listitem><simpara></simpara></listitem> +<listitem><simpara>Slot for <link linkend="AppIndicator-scroll-event"><type>"scroll-event"</type></link></simpara></listitem> </varlistentry> <varlistentry><term><structfield id="AppIndicatorClass.app-indicator-reserved-ats">app_indicator_reserved_ats</structfield> ()</term> <listitem><simpara>Reserved for future use.</simpara></listitem> 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 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 $@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 9f0135d..e1ff4c6 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1034,6 +1034,7 @@ test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libapp 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 $@ |