aboutsummaryrefslogtreecommitdiff
path: root/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2010-07-01 11:24:43 +0200
committerEvgeni Golov <evgeni@debian.org>2010-07-01 11:24:43 +0200
commit6830905830ac78271515c586442a090cf7a0e3ff (patch)
tree9f5ef29e46f14d553df2622d38df80ea6ee1f0ac /docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html
parentc6d95ac4d53118c0a2f4b05c760bd03cc55e8c67 (diff)
parent01780416e8c1267838892fb6d114a84fe33dc590 (diff)
downloadlibdbusmenu-6830905830ac78271515c586442a090cf7a0e3ff.tar.gz
libdbusmenu-6830905830ac78271515c586442a090cf7a0e3ff.tar.bz2
libdbusmenu-6830905830ac78271515c586442a090cf7a0e3ff.zip
Merging lp:~ubuntu-desktop/dbusmenu/ubuntu
* New upstream release. * Adding support for menu shortcuts (LP: #591293) * Fixing distcheck of documentation builds * Autogen.sh fix for adding custom prefix (LP: #595565) * Fixing children property name to match spec (LP: #597321) * Merging in Debian branch * debian/control: Switching branch on this branch to be the dbusmenu-team. * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions * Merge from Ubuntu. Closes: #586069 * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. - Update package descriptions. - Standards-Version: 3.8.4 - Fix Homepage URL. - Update Vcs-* fields. * debian/copyright: - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. - Add Aurélien Gâteau, according to headers.
Diffstat (limited to 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html')
-rw-r--r--docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html
index 67b633c..6487809 100644
--- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html
+++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html
@@ -121,7 +121,7 @@ Accesses the private variable of which <a class="link" href="libdbusmenu-glib-Db
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object or a <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if we
+<td> A <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> object or a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if we
don't have one or there is an error.
</td>
</tr>