diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-01-06 10:17:44 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-01-06 10:17:44 -0500 |
| commit | 9d5b3b0e989c12c8ed600272aa895390b277c0dc (patch) | |
| tree | 8e415a8e7136d6e135ec88d6cd186f1ae04e35e2 /docs/reference | |
| parent | 54c9e642092a203b35f63acf915eef78d2cb1ef0 (diff) | |
| parent | 2437d4ba20b168534165456ed0ed989a9f5f2695 (diff) | |
| download | libayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.tar.gz libayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.tar.bz2 libayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.zip | |
* Merged changes from ~ubuntu-desktop package
* Intial release.
* debian/rules
- Changes to build targets to get it building multipass for
python 2.6 and 2.7
Diffstat (limited to 'docs/reference')
| -rw-r--r-- | docs/reference/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/reference/Makefile.in | 13 | ||||
| -rw-r--r-- | docs/reference/html/api-index-full.html | 28 | ||||
| -rw-r--r-- | docs/reference/html/ch01.html | 2 | ||||
| -rw-r--r-- | docs/reference/html/index.html | 2 | ||||
| -rw-r--r-- | docs/reference/html/index.sgml | 7 | ||||
| -rw-r--r-- | docs/reference/html/libappindicator-app-indicator.html | 130 | ||||
| -rw-r--r-- | docs/reference/html/libappindicator.devhelp | 7 | ||||
| -rw-r--r-- | docs/reference/html/libappindicator.devhelp2 | 7 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/libappindicator-sections.txt | 1 | ||||
| -rw-r--r-- | docs/reference/tmpl/app-indicator.sgml | 42 | ||||
| -rw-r--r-- | docs/reference/version.xml | 2 | ||||
| -rw-r--r-- | docs/reference/xml/api-index-full.xml | 7 | ||||
| -rw-r--r-- | docs/reference/xml/app-indicator.xml | 90 |
15 files changed, 124 insertions, 220 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 63606f9..b6b0289 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -90,8 +90,8 @@ expand_content_files= # signals and properties. # 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 $(INDICATOR_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS) +GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(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 4b558a4..47dc8e5 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -84,7 +84,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -111,10 +110,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -131,6 +126,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -176,6 +173,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -325,8 +324,8 @@ expand_content_files = # signals and properties. # 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 $(INDICATOR_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS) +GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) +GTKDOC_LIBS = $(top_builddir)/src/libappindicator.la $(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-full.html b/docs/reference/html/api-index-full.html index 8d49112..73ff9ee 100644 --- a/docs/reference/html/api-index-full.html +++ b/docs/reference/html/api-index-full.html @@ -58,10 +58,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="libappindicator-app-indicator.html#AppIndicator-x-ayatana-new-label" title='The "x-ayatana-new-label" signal'>AppIndicator::x-ayatana-new-label</a>, object signal in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> -</dt> -<dd></dd> -<dt> <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>AppIndicator:attention-icon-name</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> </dt> <dd></dd> @@ -74,6 +70,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server" title='The "dbus-menu-server" property'>AppIndicator:dbus-menu-server</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> +</dt> +<dd></dd> +<dt> <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>AppIndicator:icon-name</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> </dt> <dd></dd> @@ -94,10 +94,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="libappindicator-app-indicator.html#AppIndicator--menu" title='The "menu" property'>AppIndicator:menu</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> -</dt> -<dd></dd> -<dt> <a class="link" href="libappindicator-app-indicator.html#AppIndicator--ordering-index" title='The "ordering-index" property'>AppIndicator:ordering-index</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> </dt> <dd></dd> @@ -106,18 +102,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label" title='The "x-ayatana-label" property'>AppIndicator:x-ayatana-label</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> -</dt> -<dd></dd> -<dt> -<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label-guide" title='The "x-ayatana-label-guide" property'>AppIndicator:x-ayatana-label-guide</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> -</dt> -<dd></dd> -<dt> -<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-ordering-index" title='The "x-ayatana-ordering-index" property'>AppIndicator:x-ayatana-ordering-index</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> -</dt> -<dd></dd> -<dt> <a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory">AppIndicatorCategory</a>, enum in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">app-indicator</a> </dt> <dd></dd> @@ -134,6 +118,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop" title="app_indicator_build_menu_from_desktop ()">app_indicator_build_menu_from_desktop</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a> +</dt> +<dd></dd> +<dt> <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-CLASS:CAPS" title="APP_INDICATOR_CLASS()">APP_INDICATOR_CLASS</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 4f088b5..c46e493 100644 --- a/docs/reference/html/ch01.html +++ b/docs/reference/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Base Classes for Applications"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id401945"></a>Base Classes for Applications</h2></div></div></div> +<a name="id535850"></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 24d5285..bde5569 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.90 + for libappindicator 0.2.91 </p></div> </div> <hr> diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml index 550deb3..b0a0a95 100644 --- a/docs/reference/html/index.sgml +++ b/docs/reference/html/index.sgml @@ -52,21 +52,19 @@ <ANCHOR id="app-indicator-get-label" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-label"> <ANCHOR id="app-indicator-get-label-guide" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-label-guide"> <ANCHOR id="app-indicator-get-ordering-index" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-ordering-index"> +<ANCHOR id="app-indicator-build-menu-from-desktop" href="libappindicator/libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop"> <ANCHOR id="libappindicator-app-indicator.property-details" href="libappindicator/libappindicator-app-indicator.html#libappindicator-app-indicator.property-details"> <ANCHOR id="AppIndicator--attention-icon-name" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--attention-icon-name"> <ANCHOR id="AppIndicator--category" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--category"> <ANCHOR id="AppIndicator--connected" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--connected"> +<ANCHOR id="AppIndicator--dbus-menu-server" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--dbus-menu-server"> <ANCHOR id="AppIndicator--icon-name" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--icon-name"> <ANCHOR id="AppIndicator--icon-theme-path" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--icon-theme-path"> <ANCHOR id="AppIndicator--id" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--id"> <ANCHOR id="AppIndicator--label" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--label"> <ANCHOR id="AppIndicator--label-guide" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--label-guide"> -<ANCHOR id="AppIndicator--menu" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--menu"> <ANCHOR id="AppIndicator--ordering-index" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--ordering-index"> <ANCHOR id="AppIndicator--status" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--status"> -<ANCHOR id="AppIndicator--x-ayatana-label" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--x-ayatana-label"> -<ANCHOR id="AppIndicator--x-ayatana-label-guide" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--x-ayatana-label-guide"> -<ANCHOR id="AppIndicator--x-ayatana-ordering-index" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--x-ayatana-ordering-index"> <ANCHOR id="libappindicator-app-indicator.signal-details" href="libappindicator/libappindicator-app-indicator.html#libappindicator-app-indicator.signal-details"> <ANCHOR id="AppIndicator-connection-changed" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-connection-changed"> <ANCHOR id="AppIndicator-new-attention-icon" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-attention-icon"> @@ -74,4 +72,3 @@ <ANCHOR id="AppIndicator-new-icon-theme-path" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-icon-theme-path"> <ANCHOR id="AppIndicator-new-label" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-label"> <ANCHOR id="AppIndicator-new-status" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-status"> -<ANCHOR id="AppIndicator-x-ayatana-new-label" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-x-ayatana-new-label"> diff --git a/docs/reference/html/libappindicator-app-indicator.html b/docs/reference/html/libappindicator-app-indicator.html index 2217219..94cf302 100644 --- a/docs/reference/html/libappindicator-app-indicator.html +++ b/docs/reference/html/libappindicator-app-indicator.html @@ -101,6 +101,10 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label" title="app_indicator_get_label ()">app_indicator_get_label</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label-guide" title="app_indicator_get_label_guide ()">app_indicator_get_label_guide</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-ordering-index" title="app_indicator_get_ordering_index ()">app_indicator_get_ordering_index</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); +<span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop" title="app_indicator_build_menu_from_desktop ()">app_indicator_build_menu_from_desktop</a> + (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *desktop_file</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *desktop_profile</code></em>); </pre> </div> <div class="refsect1" title="Object Hierarchy"> @@ -116,17 +120,14 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>attention-icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'>category</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--connected" title='The "connected" property'>connected</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server" title='The "dbus-menu-server" property'>dbus-menu-server</a>" <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>* : Read / Write "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-theme-path" title='The "icon-theme-path" property'>icon-theme-path</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'>id</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--label" title='The "label" property'>label</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--label-guide" title='The "label-guide" property'>label-guide</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--menu" title='The "menu" property'>menu</a>" <span class="type">DBusGObjectPath</span>* : Read "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--ordering-index" title='The "ordering-index" property'>ordering-index</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--status" title='The "status" property'>status</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label" title='The "x-ayatana-label" property'>x-ayatana-label</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label-guide" title='The "x-ayatana-label-guide" property'>x-ayatana-label-guide</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--x-ayatana-ordering-index" title='The "x-ayatana-ordering-index" property'>x-ayatana-ordering-index</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write </pre> </div> <div class="refsect1" title="Signals"> @@ -138,7 +139,6 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm "<a class="link" href="libappindicator-app-indicator.html#AppIndicator-new-icon-theme-path" title='The "new-icon-theme-path" signal'>new-icon-theme-path</a>" : Run Last "<a class="link" href="libappindicator-app-indicator.html#AppIndicator-new-label" title='The "new-label" signal'>new-label</a>" : Run Last "<a class="link" href="libappindicator-app-indicator.html#AppIndicator-new-status" title='The "new-status" signal'>new-status</a>" : Run Last - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator-x-ayatana-new-label" title='The "x-ayatana-new-label" signal'>x-ayatana-new-label</a>" : Run Last </pre> </div> <div class="refsect1" title="Description"> @@ -703,7 +703,7 @@ Sets the menu that should be shown when the Application Indicator is clicked on in the panel. An application indicator will not be rendered unless it has a menu. - Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--menu" title='The "menu" property'><span class="type">"menu"</span></a>. + Wrapper function for property <a href="/usr/share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html#AppIndicator--menu"><span class="type">"menu"</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -977,7 +977,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato <pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * app_indicator_get_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> <p> Gets the menu being used for this application indicator. - Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--menu" title='The "menu" property'><span class="type">"menu"</span></a>. + Wrapper function for property <a href="/usr/share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html#AppIndicator--menu"><span class="type">"menu"</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -1064,6 +1064,38 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato </tbody> </table></div> </div> +<hr> +<div class="refsect2" title="app_indicator_build_menu_from_desktop ()"> +<a name="app-indicator-build-menu-from-desktop"></a><h3>app_indicator_build_menu_from_desktop ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> app_indicator_build_menu_from_desktop + (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *desktop_file</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *desktop_profile</code></em>);</pre> +<p> +This function allows for building the Application Indicator menu + from a static desktop file. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td> +<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object to use +</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>desktop_file</code></em> :</span></p></td> +<td>A path to the desktop file to build the menu from +</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>desktop_profile</code></em> :</span></p></td> +<td>Which entries should be used from the desktop file +</td> +</tr> +</tbody> +</table></div> +</div> </div> <div class="refsect1" title="Property Details"> <a name="libappindicator-app-indicator.property-details"></a><h2>Property Details</h2> @@ -1097,6 +1129,15 @@ Pretty simple, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standa <p>Default value: FALSE</p> </div> <hr> +<div class="refsect2" title='The "dbus-menu-server" property'> +<a name="AppIndicator--dbus-menu-server"></a><h3>The <code class="literal">"dbus-menu-server"</code> property</h3> +<pre class="programlisting"> "dbus-menu-server" <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>* : Read / Write</pre> +<p> +A way to get the internal dbusmenu server if it is available. + This should only be used for testing. +</p> +</div> +<hr> <div class="refsect2" title='The "icon-name" property'> <a name="AppIndicator--icon-name"></a><h3>The <code class="literal">"icon-name"</code> property</h3> <pre class="programlisting"> "icon-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct</pre> @@ -1155,14 +1196,6 @@ An optional string to provide guidance to the panel on how big <p>Default value: NULL</p> </div> <hr> -<div class="refsect2" title='The "menu" property'> -<a name="AppIndicator--menu"></a><h3>The <code class="literal">"menu"</code> property</h3> -<pre class="programlisting"> "menu" <span class="type">DBusGObjectPath</span>* : Read</pre> -<p> -A method for getting the menu path as a string for DBus. -</p> -</div> -<hr> <div class="refsect2" title='The "ordering-index" property'> <a name="AppIndicator--ordering-index"></a><h3>The <code class="literal">"ordering-index"</code> property</h3> <pre class="programlisting"> "ordering-index" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre> @@ -1188,37 +1221,6 @@ Whether the indicator is shown or requests attention. Defaults to </p> <p>Default value: NULL</p> </div> -<hr> -<div class="refsect2" title='The "x-ayatana-label" property'> -<a name="AppIndicator--x-ayatana-label"></a><h3>The <code class="literal">"x-ayatana-label"</code> property</h3> -<pre class="programlisting"> "x-ayatana-label" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> -<p> -Wrapper for <a class="link" href="libappindicator-app-indicator.html#AppIndicator--label" title='The "label" property'><span class="type">"label"</span></a>. Please use that in all of your - code. -</p> -<p>Default value: NULL</p> -</div> -<hr> -<div class="refsect2" title='The "x-ayatana-label-guide" property'> -<a name="AppIndicator--x-ayatana-label-guide"></a><h3>The <code class="literal">"x-ayatana-label-guide"</code> property</h3> -<pre class="programlisting"> "x-ayatana-label-guide" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> -<p> -Wrapper for <a class="link" href="libappindicator-app-indicator.html#AppIndicator--label-guide" title='The "label-guide" property'><span class="type">"label-guide"</span></a>. Please use that in all of your - code. -</p> -<p>Default value: NULL</p> -</div> -<hr> -<div class="refsect2" title='The "x-ayatana-ordering-index" property'> -<a name="AppIndicator--x-ayatana-ordering-index"></a><h3>The <code class="literal">"x-ayatana-ordering-index"</code> property</h3> -<pre class="programlisting"> "x-ayatana-ordering-index" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre> -<p> -A wrapper for <a class="link" href="libappindicator-app-indicator.html#AppIndicator--ordering-index" title='The "ordering-index" property'><span class="type">"ordering-index"</span></a> so that it can match the - dbus interface currently. It will hopefully be retired, please don't - use it anywhere. -</p> -<p>Default value: 0</p> -</div> </div> <div class="refsect1" title="Signal Details"> <a name="libappindicator-app-indicator.signal-details"></a><h2>Signal Details</h2> @@ -1386,42 +1388,6 @@ Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicat </tbody> </table></div> </div> -<hr> -<div class="refsect2" title='The "x-ayatana-new-label" signal'> -<a name="AppIndicator-x-ayatana-new-label"></a><h3>The <code class="literal">"x-ayatana-new-label"</code> signal</h3> -<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *arg0, - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *arg1, - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *arg1, - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> -<p> -Wrapper for <a class="link" href="libappindicator-app-indicator.html#AppIndicator-new-label" title='The "new-label" signal'><span class="type">"new-label"</span></a>, please don't use this signal - use the other one. -</p> -<div class="variablelist"><table border="0"> -<col align="left" valign="top"> -<tbody> -<tr> -<td><p><span class="term"><em class="parameter"><code>arg0</code></em> :</span></p></td> -<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object -</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td> -<td>The string for the label -</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>arg1</code></em> :</span></p></td> -<td>The string for the guide -</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td>user data set when the signal handler was connected.</td> -</tr> -</tbody> -</table></div> -</div> </div> </div> <div class="footer"> diff --git a/docs/reference/html/libappindicator.devhelp b/docs/reference/html/libappindicator.devhelp index 848aa27..fa15ccd 100644 --- a/docs/reference/html/libappindicator.devhelp +++ b/docs/reference/html/libappindicator.devhelp @@ -46,26 +46,23 @@ <function name="app_indicator_get_label ()" link="libappindicator-app-indicator.html#app-indicator-get-label"/> <function name="app_indicator_get_label_guide ()" link="libappindicator-app-indicator.html#app-indicator-get-label-guide"/> <function name="app_indicator_get_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-get-ordering-index"/> + <function name="app_indicator_build_menu_from_desktop ()" link="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop"/> <function name="The "attention-icon-name" property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-name"/> <function name="The "category" property" link="libappindicator-app-indicator.html#AppIndicator--category"/> <function name="The "connected" property" link="libappindicator-app-indicator.html#AppIndicator--connected"/> + <function name="The "dbus-menu-server" property" link="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server"/> <function name="The "icon-name" property" link="libappindicator-app-indicator.html#AppIndicator--icon-name"/> <function name="The "icon-theme-path" property" link="libappindicator-app-indicator.html#AppIndicator--icon-theme-path"/> <function name="The "id" property" link="libappindicator-app-indicator.html#AppIndicator--id"/> <function name="The "label" property" link="libappindicator-app-indicator.html#AppIndicator--label"/> <function name="The "label-guide" property" link="libappindicator-app-indicator.html#AppIndicator--label-guide"/> - <function name="The "menu" property" link="libappindicator-app-indicator.html#AppIndicator--menu"/> <function name="The "ordering-index" property" link="libappindicator-app-indicator.html#AppIndicator--ordering-index"/> <function name="The "status" property" link="libappindicator-app-indicator.html#AppIndicator--status"/> - <function name="The "x-ayatana-label" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label"/> - <function name="The "x-ayatana-label-guide" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label-guide"/> - <function name="The "x-ayatana-ordering-index" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-ordering-index"/> <function name="The "connection-changed" signal" link="libappindicator-app-indicator.html#AppIndicator-connection-changed"/> <function name="The "new-attention-icon" signal" link="libappindicator-app-indicator.html#AppIndicator-new-attention-icon"/> <function name="The "new-icon" signal" link="libappindicator-app-indicator.html#AppIndicator-new-icon"/> <function name="The "new-icon-theme-path" signal" link="libappindicator-app-indicator.html#AppIndicator-new-icon-theme-path"/> <function name="The "new-label" signal" link="libappindicator-app-indicator.html#AppIndicator-new-label"/> <function name="The "new-status" signal" link="libappindicator-app-indicator.html#AppIndicator-new-status"/> - <function name="The "x-ayatana-new-label" signal" link="libappindicator-app-indicator.html#AppIndicator-x-ayatana-new-label"/> </functions> </book> diff --git a/docs/reference/html/libappindicator.devhelp2 b/docs/reference/html/libappindicator.devhelp2 index 644764f..e557040 100644 --- a/docs/reference/html/libappindicator.devhelp2 +++ b/docs/reference/html/libappindicator.devhelp2 @@ -46,27 +46,24 @@ <keyword type="function" name="app_indicator_get_label ()" link="libappindicator-app-indicator.html#app-indicator-get-label"/> <keyword type="function" name="app_indicator_get_label_guide ()" link="libappindicator-app-indicator.html#app-indicator-get-label-guide"/> <keyword type="function" name="app_indicator_get_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-get-ordering-index"/> + <keyword type="function" name="app_indicator_build_menu_from_desktop ()" link="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop"/> <keyword type="property" name="The "attention-icon-name" property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-name"/> <keyword type="property" name="The "category" property" link="libappindicator-app-indicator.html#AppIndicator--category"/> <keyword type="property" name="The "connected" property" link="libappindicator-app-indicator.html#AppIndicator--connected"/> + <keyword type="property" name="The "dbus-menu-server" property" link="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server"/> <keyword type="property" name="The "icon-name" property" link="libappindicator-app-indicator.html#AppIndicator--icon-name"/> <keyword type="property" name="The "icon-theme-path" property" link="libappindicator-app-indicator.html#AppIndicator--icon-theme-path"/> <keyword type="property" name="The "id" property" link="libappindicator-app-indicator.html#AppIndicator--id"/> <keyword type="property" name="The "label" property" link="libappindicator-app-indicator.html#AppIndicator--label"/> <keyword type="property" name="The "label-guide" property" link="libappindicator-app-indicator.html#AppIndicator--label-guide"/> - <keyword type="property" name="The "menu" property" link="libappindicator-app-indicator.html#AppIndicator--menu"/> <keyword type="property" name="The "ordering-index" property" link="libappindicator-app-indicator.html#AppIndicator--ordering-index"/> <keyword type="property" name="The "status" property" link="libappindicator-app-indicator.html#AppIndicator--status"/> - <keyword type="property" name="The "x-ayatana-label" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label"/> - <keyword type="property" name="The "x-ayatana-label-guide" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-label-guide"/> - <keyword type="property" name="The "x-ayatana-ordering-index" property" link="libappindicator-app-indicator.html#AppIndicator--x-ayatana-ordering-index"/> <keyword type="signal" name="The "connection-changed" signal" link="libappindicator-app-indicator.html#AppIndicator-connection-changed"/> <keyword type="signal" name="The "new-attention-icon" signal" link="libappindicator-app-indicator.html#AppIndicator-new-attention-icon"/> <keyword type="signal" name="The "new-icon" signal" link="libappindicator-app-indicator.html#AppIndicator-new-icon"/> <keyword type="signal" name="The "new-icon-theme-path" signal" link="libappindicator-app-indicator.html#AppIndicator-new-icon-theme-path"/> <keyword type="signal" name="The "new-label" signal" link="libappindicator-app-indicator.html#AppIndicator-new-label"/> <keyword type="signal" name="The "new-status" signal" link="libappindicator-app-indicator.html#AppIndicator-new-status"/> - <keyword type="signal" name="The "x-ayatana-new-label" signal" link="libappindicator-app-indicator.html#AppIndicator-x-ayatana-new-label"/> <keyword type="constant" name="APP_INDICATOR_CATEGORY_APPLICATION_STATUS" link="libappindicator-app-indicator.html#APP-INDICATOR-CATEGORY-APPLICATION-STATUS:CAPS"/> <keyword type="constant" name="APP_INDICATOR_CATEGORY_COMMUNICATIONS" link="libappindicator-app-indicator.html#APP-INDICATOR-CATEGORY-COMMUNICATIONS:CAPS"/> <keyword type="constant" name="APP_INDICATOR_CATEGORY_SYSTEM_SERVICES" link="libappindicator-app-indicator.html#APP-INDICATOR-CATEGORY-SYSTEM-SERVICES:CAPS"/> diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index b65cc74..ae88cff 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.90 + for libappindicator 0.2.91 </releaseinfo> </bookinfo> diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index e0effd1..41ff7fa 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -38,5 +38,6 @@ app_indicator_get_menu app_indicator_get_label app_indicator_get_label_guide app_indicator_get_ordering_index +app_indicator_build_menu_from_desktop </SECTION> diff --git a/docs/reference/tmpl/app-indicator.sgml b/docs/reference/tmpl/app-indicator.sgml index 38b9b3c..3f803db 100644 --- a/docs/reference/tmpl/app-indicator.sgml +++ b/docs/reference/tmpl/app-indicator.sgml @@ -190,26 +190,22 @@ AppIndicator @appindicator: the object which received the signal. @arg1: -<!-- ##### SIGNAL AppIndicator::x-ayatana-new-label ##### --> +<!-- ##### ARG AppIndicator:attention-icon-name ##### --> <para> </para> -@appindicator: the object which received the signal. -@arg1: -@arg2: - -<!-- ##### ARG AppIndicator:attention-icon-name ##### --> +<!-- ##### ARG AppIndicator:category ##### --> <para> </para> -<!-- ##### ARG AppIndicator:category ##### --> +<!-- ##### ARG AppIndicator:connected ##### --> <para> </para> -<!-- ##### ARG AppIndicator:connected ##### --> +<!-- ##### ARG AppIndicator:dbus-menu-server ##### --> <para> </para> @@ -239,11 +235,6 @@ AppIndicator </para> -<!-- ##### ARG AppIndicator:menu ##### --> -<para> - -</para> - <!-- ##### ARG AppIndicator:ordering-index ##### --> <para> @@ -254,21 +245,6 @@ AppIndicator </para> -<!-- ##### ARG AppIndicator:x-ayatana-label ##### --> -<para> - -</para> - -<!-- ##### ARG AppIndicator:x-ayatana-label-guide ##### --> -<para> - -</para> - -<!-- ##### ARG AppIndicator:x-ayatana-ordering-index ##### --> -<para> - -</para> - <!-- ##### STRUCT AppIndicatorClass ##### --> <para> @@ -478,3 +454,13 @@ AppIndicator @Returns: +<!-- ##### FUNCTION app_indicator_build_menu_from_desktop ##### --> +<para> + +</para> + +@self: +@desktop_file: +@desktop_profile: + + diff --git a/docs/reference/version.xml b/docs/reference/version.xml index d66d2f8..43a6317 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.90 +0.2.91 diff --git a/docs/reference/xml/api-index-full.xml b/docs/reference/xml/api-index-full.xml index 5a26892..84a6606 100644 --- a/docs/reference/xml/api-index-full.xml +++ b/docs/reference/xml/api-index-full.xml @@ -14,25 +14,22 @@ <indexentry><primaryie linkends="AppIndicator-new-icon-theme-path"><link linkend="AppIndicator-new-icon-theme-path">AppIndicator::new-icon-theme-path</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator-new-label"><link linkend="AppIndicator-new-label">AppIndicator::new-label</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator-new-status"><link linkend="AppIndicator-new-status">AppIndicator::new-status</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> -<indexentry><primaryie linkends="AppIndicator-x-ayatana-new-label"><link linkend="AppIndicator-x-ayatana-new-label">AppIndicator::x-ayatana-new-label</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--attention-icon-name"><link linkend="AppIndicator--attention-icon-name">AppIndicator:attention-icon-name</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--category"><link linkend="AppIndicator--category">AppIndicator:category</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--connected"><link linkend="AppIndicator--connected">AppIndicator:connected</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> +<indexentry><primaryie linkends="AppIndicator--dbus-menu-server"><link linkend="AppIndicator--dbus-menu-server">AppIndicator:dbus-menu-server</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--icon-name"><link linkend="AppIndicator--icon-name">AppIndicator:icon-name</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--icon-theme-path"><link linkend="AppIndicator--icon-theme-path">AppIndicator:icon-theme-path</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--id"><link linkend="AppIndicator--id">AppIndicator:id</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--label"><link linkend="AppIndicator--label">AppIndicator:label</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--label-guide"><link linkend="AppIndicator--label-guide">AppIndicator:label-guide</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> -<indexentry><primaryie linkends="AppIndicator--menu"><link linkend="AppIndicator--menu">AppIndicator:menu</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--ordering-index"><link linkend="AppIndicator--ordering-index">AppIndicator:ordering-index</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicator--status"><link linkend="AppIndicator--status">AppIndicator:status</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> -<indexentry><primaryie linkends="AppIndicator--x-ayatana-label"><link linkend="AppIndicator--x-ayatana-label">AppIndicator:x-ayatana-label</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> -<indexentry><primaryie linkends="AppIndicator--x-ayatana-label-guide"><link linkend="AppIndicator--x-ayatana-label-guide">AppIndicator:x-ayatana-label-guide</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> -<indexentry><primaryie linkends="AppIndicator--x-ayatana-ordering-index"><link linkend="AppIndicator--x-ayatana-ordering-index">AppIndicator:x-ayatana-ordering-index</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicatorCategory"><link linkend="AppIndicatorCategory">AppIndicatorCategory</link>, enum in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicatorClass"><link linkend="AppIndicatorClass">AppIndicatorClass</link>, struct in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicatorPrivate"><link linkend="AppIndicatorPrivate">AppIndicatorPrivate</link>, struct in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="AppIndicatorStatus"><link linkend="AppIndicatorStatus">AppIndicatorStatus</link>, enum in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> +<indexentry><primaryie linkends="app-indicator-build-menu-from-desktop"><link linkend="app-indicator-build-menu-from-desktop">app_indicator_build_menu_from_desktop</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="APP-INDICATOR-CLASS:CAPS"><link linkend="APP-INDICATOR-CLASS:CAPS">APP_INDICATOR_CLASS</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry> <indexentry><primaryie linkends="app-indicator-get-attention-icon"><link linkend="app-indicator-get-attention-icon">app_indicator_get_attention_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> <indexentry><primaryie linkends="app-indicator-get-category"><link linkend="app-indicator-get-category">app_indicator_get_category</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry> diff --git a/docs/reference/xml/app-indicator.xml b/docs/reference/xml/app-indicator.xml index 09a63a7..c6c78c4 100644 --- a/docs/reference/xml/app-indicator.xml +++ b/docs/reference/xml/app-indicator.xml @@ -78,6 +78,10 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> * <lin const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> * <link linkend="app-indicator-get-label">app_indicator_get_label</link> (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>); const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> * <link linkend="app-indicator-get-label-guide">app_indicator_get_label_guide</link> (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>); <link linkend="guint32"><returnvalue>guint32</returnvalue></link> <link linkend="app-indicator-get-ordering-index">app_indicator_get_ordering_index</link> (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>); +<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="app-indicator-build-menu-from-desktop">app_indicator_build_menu_from_desktop</link> + (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>, + <parameter>const <link linkend="gchar"><type>gchar</type></link> *desktop_file</parameter>, + <parameter>const <link linkend="gchar"><type>gchar</type></link> *desktop_profile</parameter>); </synopsis> </refsynopsisdiv> <refsect1 id="libappindicator-app-indicator.object-hierarchy" role="object_hierarchy"> @@ -93,17 +97,14 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> * <lin "<link linkend="AppIndicator--attention-icon-name">attention-icon-name</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write "<link linkend="AppIndicator--category">category</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write / Construct Only "<link linkend="AppIndicator--connected">connected</link>" <link linkend="gboolean"><type>gboolean</type></link> : Read + "<link linkend="AppIndicator--dbus-menu-server">dbus-menu-server</link>" <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>* : Read / Write "<link linkend="AppIndicator--icon-name">icon-name</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write / Construct "<link linkend="AppIndicator--icon-theme-path">icon-theme-path</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write / Construct "<link linkend="AppIndicator--id">id</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write / Construct Only "<link linkend="AppIndicator--label">label</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write "<link linkend="AppIndicator--label-guide">label-guide</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write - "<link linkend="AppIndicator--menu">menu</link>" <link linkend="DBusGObjectPath"><type>DBusGObjectPath</type></link>* : Read "<link linkend="AppIndicator--ordering-index">ordering-index</link>" <link linkend="guint"><type>guint</type></link> : Read / Write "<link linkend="AppIndicator--status">status</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write - "<link linkend="AppIndicator--x-ayatana-label">x-ayatana-label</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write - "<link linkend="AppIndicator--x-ayatana-label-guide">x-ayatana-label-guide</link>" <link linkend="gchar"><type>gchar</type></link>* : Read / Write - "<link linkend="AppIndicator--x-ayatana-ordering-index">x-ayatana-ordering-index</link>" <link linkend="guint"><type>guint</type></link> : Read / Write </synopsis> </refsect1> <refsect1 id="libappindicator-app-indicator.signals" role="signal_proto"> @@ -115,7 +116,6 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> * <lin "<link linkend="AppIndicator-new-icon-theme-path">new-icon-theme-path</link>" : Run Last "<link linkend="AppIndicator-new-label">new-label</link>" : Run Last "<link linkend="AppIndicator-new-status">new-status</link>" : Run Last - "<link linkend="AppIndicator-x-ayatana-new-label">x-ayatana-new-label</link>" : Run Last </synopsis> </refsect1> @@ -775,6 +775,27 @@ Wrapper function for property <link linkend="AppIndicator--ordering-index"><type <varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> The current ordering index. </simpara></listitem></varlistentry> </variablelist></refsect2> +<refsect2 id="app-indicator-build-menu-from-desktop" role="function"> +<title>app_indicator_build_menu_from_desktop ()</title> +<indexterm zone="app-indicator-build-menu-from-desktop"><primary>app_indicator_build_menu_from_desktop</primary></indexterm> +<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> app_indicator_build_menu_from_desktop + (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>, + <parameter>const <link linkend="gchar"><type>gchar</type></link> *desktop_file</parameter>, + <parameter>const <link linkend="gchar"><type>gchar</type></link> *desktop_profile</parameter>);</programlisting> +<para> +This function allows for building the Application Indicator menu + from a static desktop file. +</para><variablelist role="params"> +<varlistentry><term><parameter>self</parameter> :</term> +<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use +</simpara></listitem></varlistentry> +<varlistentry><term><parameter>desktop_file</parameter> :</term> +<listitem><simpara>A path to the desktop file to build the menu from +</simpara></listitem></varlistentry> +<varlistentry><term><parameter>desktop_profile</parameter> :</term> +<listitem><simpara>Which entries should be used from the desktop file +</simpara></listitem></varlistentry> +</variablelist></refsect2> </refsect1> <refsect1 id="libappindicator-app-indicator.property-details" role="property_details"> @@ -803,6 +824,13 @@ Pretty simple, <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if we ha displayed through this object. You should hide your TrayIcon if so. </para><para>Default value: FALSE</para> </refsect2> +<refsect2 id="AppIndicator--dbus-menu-server" role="property"><title>The <literal>"dbus-menu-server"</literal> property</title> +<indexterm zone="AppIndicator--dbus-menu-server"><primary>AppIndicator:dbus-menu-server</primary></indexterm> +<programlisting> "dbus-menu-server" <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>* : Read / Write</programlisting> +<para> +A way to get the internal dbusmenu server if it is available. + This should only be used for testing. +</para></refsect2> <refsect2 id="AppIndicator--icon-name" role="property"><title>The <literal>"icon-name"</literal> property</title> <indexterm zone="AppIndicator--icon-name"><primary>AppIndicator:icon-name</primary></indexterm> <programlisting> "icon-name" <link linkend="gchar"><type>gchar</type></link>* : Read / Write / Construct</programlisting> @@ -851,12 +879,6 @@ An optional string to provide guidance to the panel on how big get you enough power. </para><para>Default value: NULL</para> </refsect2> -<refsect2 id="AppIndicator--menu" role="property"><title>The <literal>"menu"</literal> property</title> -<indexterm zone="AppIndicator--menu"><primary>AppIndicator:menu</primary></indexterm> -<programlisting> "menu" <link linkend="DBusGObjectPath"><type>DBusGObjectPath</type></link>* : Read</programlisting> -<para> -A method for getting the menu path as a string for DBus. -</para></refsect2> <refsect2 id="AppIndicator--ordering-index" role="property"><title>The <literal>"ordering-index"</literal> property</title> <indexterm zone="AppIndicator--ordering-index"><primary>AppIndicator:ordering-index</primary></indexterm> <programlisting> "ordering-index" <link linkend="guint"><type>guint</type></link> : Read / Write</programlisting> @@ -879,31 +901,6 @@ Whether the indicator is shown or requests attention. Defaults to 'Passive'. </para><para>Default value: NULL</para> </refsect2> -<refsect2 id="AppIndicator--x-ayatana-label" role="property"><title>The <literal>"x-ayatana-label"</literal> property</title> -<indexterm zone="AppIndicator--x-ayatana-label"><primary>AppIndicator:x-ayatana-label</primary></indexterm> -<programlisting> "x-ayatana-label" <link linkend="gchar"><type>gchar</type></link>* : Read / Write</programlisting> -<para> -Wrapper for <link linkend="AppIndicator--label"><type>"label"</type></link>. Please use that in all of your - code. -</para><para>Default value: NULL</para> -</refsect2> -<refsect2 id="AppIndicator--x-ayatana-label-guide" role="property"><title>The <literal>"x-ayatana-label-guide"</literal> property</title> -<indexterm zone="AppIndicator--x-ayatana-label-guide"><primary>AppIndicator:x-ayatana-label-guide</primary></indexterm> -<programlisting> "x-ayatana-label-guide" <link linkend="gchar"><type>gchar</type></link>* : Read / Write</programlisting> -<para> -Wrapper for <link linkend="AppIndicator--label-guide"><type>"label-guide"</type></link>. Please use that in all of your - code. -</para><para>Default value: NULL</para> -</refsect2> -<refsect2 id="AppIndicator--x-ayatana-ordering-index" role="property"><title>The <literal>"x-ayatana-ordering-index"</literal> property</title> -<indexterm zone="AppIndicator--x-ayatana-ordering-index"><primary>AppIndicator:x-ayatana-ordering-index</primary></indexterm> -<programlisting> "x-ayatana-ordering-index" <link linkend="guint"><type>guint</type></link> : Read / Write</programlisting> -<para> -A wrapper for <link linkend="AppIndicator--ordering-index"><type>"ordering-index"</type></link> so that it can match the - dbus interface currently. It will hopefully be retired, please don't - use it anywhere. -</para><para>Default value: 0</para> -</refsect2> </refsect1> <refsect1 id="libappindicator-app-indicator.signal-details" role="signals"> @@ -999,27 +996,6 @@ Emitted when <link linkend="AppIndicator--status"><type>"status"</type></link> i </simpara></listitem></varlistentry> <varlistentry><term><parameter>user_data</parameter> :</term> <listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry> -</variablelist></refsect2><refsect2 id="AppIndicator-x-ayatana-new-label" role="signal"><title>The <literal>"x-ayatana-new-label"</literal> signal</title> -<indexterm zone="AppIndicator-x-ayatana-new-label"><primary>AppIndicator::x-ayatana-new-label</primary></indexterm> -<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="AppIndicator"><type>AppIndicator</type></link> *arg0, - <link linkend="gchar"><type>gchar</type></link> *arg1, - <link linkend="gchar"><type>gchar</type></link> *arg1, - <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting> -<para> -Wrapper for <link linkend="AppIndicator-new-label"><type>"new-label"</type></link>, please don't use this signal - use the other one. -</para><variablelist role="params"> -<varlistentry><term><parameter>arg0</parameter> :</term> -<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object -</simpara></listitem></varlistentry> -<varlistentry><term><parameter>arg1</parameter> :</term> -<listitem><simpara>The string for the label -</simpara></listitem></varlistentry> -<varlistentry><term><parameter>arg1</parameter> :</term> -<listitem><simpara>The string for the guide -</simpara></listitem></varlistentry> -<varlistentry><term><parameter>user_data</parameter> :</term> -<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry> </variablelist></refsect2> </refsect1> |