diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-12 09:31:40 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-12 09:31:40 -0500 |
| commit | 374ce0d9c90fb80b0fdf916a3fe170b050abb0fc (patch) | |
| tree | 36d90bcb75ef8d9c4a7a07c25d16b5b30339c175 /docs | |
| parent | 15f7dee1de99f6bceb4c714ef1a8ff2e7b0add09 (diff) | |
| parent | 6769e30333d906eb69789aff69d58851fe08fc00 (diff) | |
| download | ayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.tar.gz ayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.tar.bz2 ayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.zip | |
* Upstream Merge
* Add in ordering IDs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/Makefile.in | 10 | ||||
| -rw-r--r-- | docs/reference/libappindicator-sections.txt | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 10d8b2a..d2ef3bb 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -66,6 +66,7 @@ IGNORE_HFILES= \ dbus-properties-client.h \ dbus-properties-server.h \ dbus-shared.h \ + generate-id.h \ notification-item-client.h \ notification-item-server.h \ notification-watcher-client.h \ diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in index 8d6228d..1718e50 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -44,8 +44,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -157,6 +160,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYGTK_CODEGEN = @PYGTK_CODEGEN@ PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ PYTHON = @PYTHON@ @@ -295,6 +300,7 @@ IGNORE_HFILES = \ dbus-properties-client.h \ dbus-properties-server.h \ dbus-shared.h \ + generate-id.h \ notification-item-client.h \ notification-item-server.h \ notification-watcher-client.h \ diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index a342d99..e0effd1 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -27,6 +27,7 @@ app_indicator_set_menu app_indicator_set_icon app_indicator_set_icon_theme_path app_indicator_set_label +app_indicator_set_ordering_index app_indicator_get_id app_indicator_get_category app_indicator_get_status @@ -36,5 +37,6 @@ app_indicator_get_attention_icon app_indicator_get_menu app_indicator_get_label app_indicator_get_label_guide +app_indicator_get_ordering_index </SECTION> |