diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-02 11:17:44 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-02 11:17:44 -0500 |
| commit | 10cf92485ff65b6b5c17ee51fda006f079adc8c3 (patch) | |
| tree | 4a6bf839205cfbcd31e37b6b80af789de5b97d2c /docs/libdbusmenu-glib | |
| parent | ba87ab7a9a65c5ed349dda5c472ae6c8adbef322 (diff) | |
| parent | 8dbd3ed2a39b885de434da32079cd64ef264ba99 (diff) | |
| download | libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.tar.gz libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.tar.bz2 libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.zip | |
Merging in Ubuntu Desktop branch.
Diffstat (limited to 'docs/libdbusmenu-glib')
17 files changed, 77 insertions, 46 deletions
diff --git a/docs/libdbusmenu-glib/Makefile.in b/docs/libdbusmenu-glib/Makefile.in index a913f6e..4823a1d 100644 --- a/docs/libdbusmenu-glib/Makefile.in +++ b/docs/libdbusmenu-glib/Makefile.in @@ -36,7 +36,12 @@ host_triplet = @host@ subdir = docs/libdbusmenu-glib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.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)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -110,6 +115,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DBUSMENUDUMPER_CFLAGS = @DBUSMENUDUMPER_CFLAGS@ +DBUSMENUDUMPER_LIBS = @DBUSMENUDUMPER_LIBS@ DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@ DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@ DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@ @@ -190,6 +197,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@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/docs/libdbusmenu-glib/reference/Makefile.in b/docs/libdbusmenu-glib/reference/Makefile.in index 5b25276..cf17c7b 100644 --- a/docs/libdbusmenu-glib/reference/Makefile.in +++ b/docs/libdbusmenu-glib/reference/Makefile.in @@ -43,7 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make subdir = docs/libdbusmenu-glib/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.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)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -77,6 +82,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DBUSMENUDUMPER_CFLAGS = @DBUSMENUDUMPER_CFLAGS@ +DBUSMENUDUMPER_LIBS = @DBUSMENUDUMPER_LIBS@ DBUSMENUGLIB_CFLAGS = @DBUSMENUGLIB_CFLAGS@ DBUSMENUGLIB_LIBS = @DBUSMENUGLIB_LIBS@ DBUSMENUGTK_CFLAGS = @DBUSMENUGTK_CFLAGS@ @@ -157,6 +164,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@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/docs/libdbusmenu-glib/reference/html/annotation-glossary.html b/docs/libdbusmenu-glib/reference/html/annotation-glossary.html index 7fa1d86..e1674b8 100644 --- a/docs/libdbusmenu-glib/reference/html/annotation-glossary.html +++ b/docs/libdbusmenu-glib/reference/html/annotation-glossary.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="prev" href="api-index-full.html" title="API Index"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -57,6 +57,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/api-index-full.html b/docs/libdbusmenu-glib/reference/html/api-index-full.html index 33ae131..3aad52a 100644 --- a/docs/libdbusmenu-glib/reference/html/api-index-full.html +++ b/docs/libdbusmenu-glib/reference/html/api-index-full.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="prev" href="object-tree.html" title="Object Hierarchy"> <link rel="next" href="annotation-glossary.html" title="Annotation Glossary"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -409,6 +409,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html index f590fa7..52d9390 100644 --- a/docs/libdbusmenu-glib/reference/html/ch01.html +++ b/docs/libdbusmenu-glib/reference/html/ch01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="prev" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="next" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id425208"></a>API</h2></div></div></div> +<a name="id571209"></a>API</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span> @@ -43,6 +43,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/index.html b/docs/libdbusmenu-glib/reference/html/index.html index deb1fac..44ff1e9 100644 --- a/docs/libdbusmenu-glib/reference/html/index.html +++ b/docs/libdbusmenu-glib/reference/html/index.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> <link rel="home" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="next" href="ch01.html" title="API"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -41,6 +41,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html index b90a71d..4d78bf2 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="API"> <link rel="prev" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem"> <link rel="next" href="libdbusmenu-glib-DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -470,6 +470,6 @@ This function connects into the type handling of the <a class="link" href="libdb </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClientMenuitem.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClientMenuitem.html index 696fedd..4d3fb17 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClientMenuitem.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClientMenuitem.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="API"> <link rel="prev" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient"> <link rel="next" href="object-tree.html" title="Object Hierarchy"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -110,6 +110,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html index 761f8dc..a9ae97e 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="API"> <link rel="prev" href="libdbusmenu-glib-DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"> <link rel="next" href="libdbusmenu-glib-DbusmenuClient.html" title="DbusmenuClient"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -384,7 +384,8 @@ menu should be shown. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td> Extra user data sent with the function. closure</td> +<td> Extra user data sent with the function. <span class="annotation">[closure]</span> +</td> </tr> </tbody> </table></div> @@ -404,11 +405,13 @@ as an XML fragment. Should call it's own children. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>mi</code></em> :</span></p></td> -<td> Menu item that should be built from. <acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>. </td> +<td> Menu item that should be built from. <span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>]</span> +</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>stringarray</code></em> :</span></p></td> -<td> An array of strings that can be combined into an XML file.. <acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>. <acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>. <acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym>. <acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8. </td> +<td> An array of strings that can be combined into an XML file. <span class="annotation">[<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span> +</td> </tr> </tbody> </table></div> @@ -1368,7 +1371,8 @@ This calls the function <em class="parameter"><code>func</code></em> on this men </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td> User data to pass to the function. closure</td> +<td> User data to pass to the function. <span class="annotation">[closure]</span> +</td> </tr> </tbody> </table></div> @@ -1449,7 +1453,8 @@ This function is used to send the even that the submenu </tr> <tr> <td><p><span class="term"><em class="parameter"><code>cb_data</code></em> :</span></p></td> -<td> Data to pass to the callback.. closure</td> +<td> Data to pass to the callback. <span class="annotation">[closure]</span> +</td> </tr> </tbody> </table></div> @@ -1458,6 +1463,6 @@ This function is used to send the even that the submenu </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html index 67b633c..acad6cc 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="API"> <link rel="prev" href="libdbusmenu-glib-DbusmenuServer.html" title="DbusmenuServer"> <link rel="next" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -132,6 +132,6 @@ Accesses the private variable of which <a class="link" href="libdbusmenu-glib-Db </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html index 47a47db..3dd3372 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="API"> <link rel="prev" href="ch01.html" title="API"> <link rel="next" href="libdbusmenu-glib-DbusmenuMenuitemProxy.html" title="DbusmenuMenuitemProxy"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -144,12 +144,12 @@ A server which represents a sharing of a set of void (*id_prop_update)(gint id, gchar * property, gchar * value); void (*id_update)(gint id); void (*layout_updated)(gint revision); + void (*item_activation)(gint id, guint timestamp); /* Reserved */ void (*dbusmenu_server_reserved1)(void); void (*dbusmenu_server_reserved2)(void); void (*dbusmenu_server_reserved3)(void); - void (*dbusmenu_server_reserved4)(void); } DbusmenuServerClass; </pre> <p> @@ -180,22 +180,22 @@ The class implementing the virtual functions for <a class="link" href="libdbusme </td> </tr> <tr> -<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved1"></a>dbusmenu_server_reserved1</code></em> ()</span></p></td> -<td>Reserved for future use. +<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.item-activation"></a>item_activation</code></em> ()</span></p></td> +<td> </td> </tr> <tr> -<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved2"></a>dbusmenu_server_reserved2</code></em> ()</span></p></td> +<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved1"></a>dbusmenu_server_reserved1</code></em> ()</span></p></td> <td>Reserved for future use. </td> </tr> <tr> -<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved3"></a>dbusmenu_server_reserved3</code></em> ()</span></p></td> +<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved2"></a>dbusmenu_server_reserved2</code></em> ()</span></p></td> <td>Reserved for future use. </td> </tr> <tr> -<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved4"></a>dbusmenu_server_reserved4</code></em> ()</span></p></td> +<td><p><span class="term"><em class="structfield"><code><a name="DbusmenuServerClass.dbusmenu-server-reserved3"></a>dbusmenu_server_reserved3</code></em> ()</span></p></td> <td>Reserved for future use. </td> </tr> @@ -258,6 +258,6 @@ This function contains all of the <a href="/usr/share/gtk-doc/html/gobject/gobje </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/object-tree.html b/docs/libdbusmenu-glib/reference/html/object-tree.html index 0a24869..63bdf16 100644 --- a/docs/libdbusmenu-glib/reference/html/object-tree.html +++ b/docs/libdbusmenu-glib/reference/html/object-tree.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="libdbusmenu-glib Reference Manual"> <link rel="prev" href="libdbusmenu-glib-DbusmenuClientMenuitem.html" title="DbusmenuClientMenuitem"> <link rel="next" href="api-index-full.html" title="API Index"> -<meta name="generator" content="GTK-Doc V1.14 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.15 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -27,6 +27,6 @@ </div> <div class="footer"> <hr> - Generated by GTK-Doc V1.14</div> + Generated by GTK-Doc V1.15</div> </body> </html>
\ No newline at end of file diff --git a/docs/libdbusmenu-glib/reference/html/style.css b/docs/libdbusmenu-glib/reference/html/style.css index 82115eb..d544a2c 100644 --- a/docs/libdbusmenu-glib/reference/html/style.css +++ b/docs/libdbusmenu-glib/reference/html/style.css @@ -209,6 +209,14 @@ h2 .extralinks, h3 .extralinks font-weight: normal; } +.annotation +{ + /* tango:aluminium 5 */ + color: #555753; + font-size: 80%; + font-weight: normal; +} + /* code listings */ .listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ diff --git a/docs/libdbusmenu-glib/reference/tmpl/server.sgml b/docs/libdbusmenu-glib/reference/tmpl/server.sgml index 426acc6..e319fc6 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/server.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/server.sgml @@ -85,10 +85,10 @@ DbusmenuServer @id_prop_update: @id_update: @layout_updated: +@item_activation: @dbusmenu_server_reserved1: @dbusmenu_server_reserved2: @dbusmenu_server_reserved3: -@dbusmenu_server_reserved4: <!-- ##### FUNCTION dbusmenu_server_new ##### --> <para> diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml index 449d7e7..6678432 100644 --- a/docs/libdbusmenu-glib/reference/version.xml +++ b/docs/libdbusmenu-glib/reference/version.xml @@ -1 +1 @@ -0.3.6 +0.3.8 diff --git a/docs/libdbusmenu-glib/reference/xml/menuitem.xml b/docs/libdbusmenu-glib/reference/xml/menuitem.xml index 44b7a51..ef86f39 100644 --- a/docs/libdbusmenu-glib/reference/xml/menuitem.xml +++ b/docs/libdbusmenu-glib/reference/xml/menuitem.xml @@ -339,7 +339,7 @@ menu should be shown. <listitem><simpara>Menu item that should be shown </simpara></listitem></varlistentry> <varlistentry><term><parameter>user_data</parameter> :</term> -<listitem><simpara> Extra user data sent with the function. closure</simpara></listitem></varlistentry> +<listitem><simpara> Extra user data sent with the function. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="dbusmenu-menuitem-buildxml-slot-t" role="function"> <title>dbusmenu_menuitem_buildxml_slot_t ()</title> @@ -352,9 +352,9 @@ This is the function that is called to represent this menu item as an XML fragment. Should call it's own children. </para><variablelist role="params"> <varlistentry><term><parameter>mi</parameter> :</term> -<listitem><simpara> Menu item that should be built from. <acronym>in</acronym>. </simpara></listitem></varlistentry> +<listitem><simpara> Menu item that should be built from. <emphasis role="annotation">[<acronym>in</acronym>]</emphasis></simpara></listitem></varlistentry> <varlistentry><term><parameter>stringarray</parameter> :</term> -<listitem><simpara> An array of strings that can be combined into an XML file.. <acronym>inout</acronym>. <acronym>transfer none</acronym>. <acronym>array</acronym>. <acronym>element-type</acronym> utf8. </simpara></listitem></varlistentry> +<listitem><simpara> An array of strings that can be combined into an XML file. <emphasis role="annotation">[<acronym>inout</acronym>][<acronym>transfer none</acronym>][<acronym>array</acronym>][<acronym>element-type</acronym> utf8]</emphasis></simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="DbusmenuMenuitemClass" role="struct"> <title>DbusmenuMenuitemClass</title> @@ -963,7 +963,7 @@ This calls the function <parameter>func</parameter> on this menu item and all <listitem><simpara>The <link linkend="DbusmenItem"><type>DbusmenItem</type></link> to start from </simpara></listitem></varlistentry> <varlistentry><term><parameter>data</parameter> :</term> -<listitem><simpara> User data to pass to the function. closure</simpara></listitem></varlistentry> +<listitem><simpara> User data to pass to the function. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="dbusmenu-menuitem-handle-event" role="function"> <title>dbusmenu_menuitem_handle_event ()</title> @@ -1020,7 +1020,7 @@ This function is used to send the even that the submenu <listitem><simpara>Callback to call when the call has returned. </simpara></listitem></varlistentry> <varlistentry><term><parameter>cb_data</parameter> :</term> -<listitem><simpara> Data to pass to the callback.. closure</simpara></listitem></varlistentry> +<listitem><simpara> Data to pass to the callback. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry> </variablelist></refsect2> </refsect1> diff --git a/docs/libdbusmenu-glib/reference/xml/server.xml b/docs/libdbusmenu-glib/reference/xml/server.xml index 485e15d..712840a 100644 --- a/docs/libdbusmenu-glib/reference/xml/server.xml +++ b/docs/libdbusmenu-glib/reference/xml/server.xml @@ -117,12 +117,12 @@ A server which represents a sharing of a set of void (*id_prop_update)(gint id, gchar * property, gchar * value); void (*id_update)(gint id); void (*layout_updated)(gint revision); + void (*item_activation)(gint id, guint timestamp); /* Reserved */ void (*dbusmenu_server_reserved1)(void); void (*dbusmenu_server_reserved2)(void); void (*dbusmenu_server_reserved3)(void); - void (*dbusmenu_server_reserved4)(void); } DbusmenuServerClass; </programlisting> <para> @@ -144,6 +144,10 @@ The class implementing the virtual functions for <link linkend="DbusmenuServer"> <listitem><simpara>Slot for <link linkend="DbusmenuServer-layout-update"><type>"layout-update"</type></link>. </simpara></listitem> </varlistentry> +<varlistentry><term><structfield id="DbusmenuServerClass.item-activation">item_activation</structfield> ()</term> +<listitem><simpara> +</simpara></listitem> +</varlistentry> <varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved1">dbusmenu_server_reserved1</structfield> ()</term> <listitem><simpara>Reserved for future use. </simpara></listitem> @@ -156,10 +160,6 @@ The class implementing the virtual functions for <link linkend="DbusmenuServer"> <listitem><simpara>Reserved for future use. </simpara></listitem> </varlistentry> -<varlistentry><term><structfield id="DbusmenuServerClass.dbusmenu-server-reserved4">dbusmenu_server_reserved4</structfield> ()</term> -<listitem><simpara>Reserved for future use. -</simpara></listitem> -</varlistentry> </variablelist></refsect2> <refsect2 id="dbusmenu-server-new" role="function"> <title>dbusmenu_server_new ()</title> |