DBus Menu

Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 118
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 573 lines (+121/-76)
18 files modified
ChangeLog (+28/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+15/-0)
debian/gir1.2-dbusmenu-glib-0.4.install (+1/-1)
debian/libdbusmenu-glib-dev.install (+2/-2)
docs/libdbusmenu-glib/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html (+2/-1)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-glib/reference/xml/menuitem.xml (+2/-1)
docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html (+16/-16)
docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html (+3/-3)
docs/libdbusmenu-gtk/reference/html/object-tree.html (+5/-5)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-glib/Makefile.am (+13/-13)
libdbusmenu-glib/Makefile.in (+13/-13)
libdbusmenu-gtk/Makefile.am (+2/-2)
libdbusmenu-gtk/Makefile.in (+2/-2)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+49291@code.launchpad.net
To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
118. By Ken VanDine

releasing version 0.3.97-0ubuntu1

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-02-03 20:01:01 +0000
+++ ChangeLog 2011-02-10 20:46:33 +0000
@@ -1,5 +1,33 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-02-10 Ted Gould <ted@gould.cx>
4
5 0.3.97
6
72011-02-09 Ted Gould <ted@gould.cx>
8
9 Fixing the naming of the Dbusmenu Glib GIR file
10
112011-02-09 Ken VanDine <ken.vandine@canonical.com>
12
13 Fix the name used for the Dbusmenu-Glib-0.4 typelib so it can be properly used with GI. It should be Dbusmenu-0.4 (LP: #713099)
14
152011-02-06 Ted Gould <ted@gould.cx>
16
17 Fixing take to not unref
18
192011-02-04 Ted Gould <ted@gould.cx>
20
21 take_children() shouldn't unref the items as they might get deleted before the caller would be abel to use them. Making sure to put those annotations in the docs.
22
232011-02-04 Ted Gould <ted@gould.cx>
24
25 Handle ChildAdded on GtkShell items and clean up the code so that it has single functions for doing common operations.
26
272011-02-04 Michael Terry <mike@mterry.name>
28
29 watch for new menu items being added to existing menu shells
30
32011-02-03 Ted Gould <ted@gould.cx>312011-02-03 Ted Gould <ted@gould.cx>
432
5 0.3.9633 0.3.96
634
=== modified file 'configure'
--- configure 2011-02-03 20:04:43 +0000
+++ configure 2011-02-10 20:46:33 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.96.3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.97.
4#4#
5# Report bugs to <ted@canonical.com>.5# Report bugs to <ted@canonical.com>.
6#6#
@@ -703,8 +703,8 @@
703# Identity of this package.703# Identity of this package.
704PACKAGE_NAME='libdbusmenu'704PACKAGE_NAME='libdbusmenu'
705PACKAGE_TARNAME='libdbusmenu'705PACKAGE_TARNAME='libdbusmenu'
706PACKAGE_VERSION='0.3.96'706PACKAGE_VERSION='0.3.97'
707PACKAGE_STRING='libdbusmenu 0.3.96'707PACKAGE_STRING='libdbusmenu 0.3.97'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1540,7 +1540,7 @@
1540 # Omit some internal or obsolete options to make the list less imposing.1540 # Omit some internal or obsolete options to make the list less imposing.
1541 # This message is too long to be a string in the A/UX 3.1 sh.1541 # This message is too long to be a string in the A/UX 3.1 sh.
1542 cat <<_ACEOF1542 cat <<_ACEOF
1543\`configure' configures libdbusmenu 0.3.96 to adapt to many kinds of systems.1543\`configure' configures libdbusmenu 0.3.97 to adapt to many kinds of systems.
15441544
1545Usage: $0 [OPTION]... [VAR=VALUE]...1545Usage: $0 [OPTION]... [VAR=VALUE]...
15461546
@@ -1610,7 +1610,7 @@
16101610
1611if test -n "$ac_init_help"; then1611if test -n "$ac_init_help"; then
1612 case $ac_init_help in1612 case $ac_init_help in
1613 short | recursive ) echo "Configuration of libdbusmenu 0.3.96:";;1613 short | recursive ) echo "Configuration of libdbusmenu 0.3.97:";;
1614 esac1614 esac
1615 cat <<\_ACEOF1615 cat <<\_ACEOF
16161616
@@ -1750,7 +1750,7 @@
1750test -n "$ac_init_help" && exit $ac_status1750test -n "$ac_init_help" && exit $ac_status
1751if $ac_init_version; then1751if $ac_init_version; then
1752 cat <<\_ACEOF1752 cat <<\_ACEOF
1753libdbusmenu configure 0.3.961753libdbusmenu configure 0.3.97
1754generated by GNU Autoconf 2.671754generated by GNU Autoconf 2.67
17551755
1756Copyright (C) 2010 Free Software Foundation, Inc.1756Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2121,7 +2121,7 @@
2121This file contains any messages produced by compilers while2121This file contains any messages produced by compilers while
2122running configure, to aid debugging if configure makes a mistake.2122running configure, to aid debugging if configure makes a mistake.
21232123
2124It was created by libdbusmenu $as_me 0.3.96, which was2124It was created by libdbusmenu $as_me 0.3.97, which was
2125generated by GNU Autoconf 2.67. Invocation command line was2125generated by GNU Autoconf 2.67. Invocation command line was
21262126
2127 $ $0 $@2127 $ $0 $@
@@ -2942,7 +2942,7 @@
29422942
2943# Define the identity of the package.2943# Define the identity of the package.
2944 PACKAGE=libdbusmenu2944 PACKAGE=libdbusmenu
2945 VERSION=0.3.962945 VERSION=0.3.97
29462946
29472947
2948# Some tools Automake needs.2948# Some tools Automake needs.
@@ -13280,7 +13280,7 @@
13280###########################13280###########################
1328113281
13282LIBDBUSMENU_CURRENT=313282LIBDBUSMENU_CURRENT=3
13283LIBDBUSMENU_REVISION=413283LIBDBUSMENU_REVISION=5
13284LIBDBUSMENU_AGE=013284LIBDBUSMENU_AGE=0
1328513285
1328613286
@@ -14602,7 +14602,7 @@
14602# report actual input values of CONFIG_FILES etc. instead of their14602# report actual input values of CONFIG_FILES etc. instead of their
14603# values after options handling.14603# values after options handling.
14604ac_log="14604ac_log="
14605This file was extended by libdbusmenu $as_me 0.3.96, which was14605This file was extended by libdbusmenu $as_me 0.3.97, which was
14606generated by GNU Autoconf 2.67. Invocation command line was14606generated by GNU Autoconf 2.67. Invocation command line was
1460714607
14608 CONFIG_FILES = $CONFIG_FILES14608 CONFIG_FILES = $CONFIG_FILES
@@ -14668,7 +14668,7 @@
14668cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114668cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14669ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14669ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14670ac_cs_version="\\14670ac_cs_version="\\
14671libdbusmenu config.status 0.3.9614671libdbusmenu config.status 0.3.97
14672configured by $0, generated by GNU Autoconf 2.67,14672configured by $0, generated by GNU Autoconf 2.67,
14673 with options \\"\$ac_cs_config\\"14673 with options \\"\$ac_cs_config\\"
1467414674
1467514675
=== modified file 'configure.ac'
--- configure.ac 2011-02-03 20:04:43 +0000
+++ configure.ac 2011-02-10 20:46:33 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.96, ted@canonical.com)2AC_INIT(libdbusmenu, 0.3.97, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009,2010 Canonical])3AC_COPYRIGHT([Copyright 2009,2010 Canonical])
44
5AC_PREREQ(2.62)5AC_PREREQ(2.62)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.96, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.97, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -136,7 +136,7 @@
136###########################136###########################
137137
138LIBDBUSMENU_CURRENT=3138LIBDBUSMENU_CURRENT=3
139LIBDBUSMENU_REVISION=4139LIBDBUSMENU_REVISION=5
140LIBDBUSMENU_AGE=0140LIBDBUSMENU_AGE=0
141141
142AC_SUBST(LIBDBUSMENU_CURRENT)142AC_SUBST(LIBDBUSMENU_CURRENT)
143143
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-07 14:51:35 +0000
+++ debian/changelog 2011-02-10 20:46:33 +0000
@@ -1,3 +1,18 @@
1libdbusmenu (0.3.97-0ubuntu1~ppa1) natty; urgency=low
2
3 [Ted Gould]
4 * New upstream release.
5 ∘ Handle ChildAdded on GtkShell items (LP: #709839)
6 ∘ Fixing take_children() to not unref
7 ∘ Fix naming of the GIR file (LP: #713099)
8
9 [Ken VanDine]
10 * debian/gir1.2-dbusmenu-glib-0.4.install,
11 debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala
12 file names
13
14 -- Ted Gould <ted@ubuntu.com> Thu, 10 Feb 2011 14:40:14 -0600
15
1libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low16libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
217
3 * libdbusmenu-gtk/parser.c18 * libdbusmenu-gtk/parser.c
419
=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-01-06 03:53:31 +0000
+++ debian/gir1.2-dbusmenu-glib-0.4.install 2011-02-10 20:46:33 +0000
@@ -1,1 +1,1 @@
1debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib1debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib
22
=== modified file 'debian/libdbusmenu-glib-dev.install'
--- debian/libdbusmenu-glib-dev.install 2010-12-07 16:00:57 +0000
+++ debian/libdbusmenu-glib-dev.install 2011-02-10 20:46:33 +0000
@@ -2,5 +2,5 @@
2debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc2debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
3debian/tmp/usr/lib/libdbusmenu-glib.a3debian/tmp/usr/lib/libdbusmenu-glib.a
4debian/tmp/usr/lib/libdbusmenu-glib.so4debian/tmp/usr/lib/libdbusmenu-glib.so
5debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir5debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir
6debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi6debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi
77
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html 2011-02-03 20:01:01 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html 2011-02-10 20:46:33 +0000
@@ -21,7 +21,7 @@
21</tr></table>21</tr></table>
22<div class="chapter">22<div class="chapter">
23<div class="titlepage"><div><div><h2 class="title">23<div class="titlepage"><div><div><h2 class="title">
24<a name="id450827"></a>API</h2></div></div></div>24<a name="id508273"></a>API</h2></div></div></div>
25<div class="toc"><dl>25<div class="toc"><dl>
26<dt>26<dt>
27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
2828
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-02-10 20:46:33 +0000
@@ -624,7 +624,8 @@
624</tr>624</tr>
625<tr>625<tr>
626<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>626<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
627<td>A <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.</td>627<td>(transfer full) (array) (element-type Dbusmenu.Menuitem)
628A <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of pointers to <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> objects.</td>
628</tr>629</tr>
629</tbody>630</tbody>
630</table></div>631</table></div>
631632
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2011-02-03 20:04:43 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2011-02-10 20:46:33 +0000
@@ -1,1 +1,1 @@
10.3.9610.3.97
22
=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
--- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-02-10 20:46:33 +0000
@@ -499,7 +499,8 @@
499</para><variablelist role="params">499</para><variablelist role="params">
500<varlistentry><term><parameter>mi</parameter>&#160;:</term>500<varlistentry><term><parameter>mi</parameter>&#160;:</term>
501<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.</simpara></listitem></varlistentry>501<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.</simpara></listitem></varlistentry>
502<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.</simpara></listitem></varlistentry>502<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>(transfer full) (array) (element-type Dbusmenu.Menuitem)
503A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.</simpara></listitem></varlistentry>
503</variablelist></refsect2>504</variablelist></refsect2>
504<refsect2 id="dbusmenu-menuitem-get-position" role="function">505<refsect2 id="dbusmenu-menuitem-get-position" role="function">
505<title>dbusmenu_menuitem_get_position ()</title>506<title>dbusmenu_menuitem_get_position ()</title>
506507
=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html'
--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2011-02-10 20:46:33 +0000
@@ -43,17 +43,17 @@
43struct <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass" title="struct DbusmenuGtkClientClass">DbusmenuGtkClientClass</a>;43struct <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass" title="struct DbusmenuGtkClientClass">DbusmenuGtkClientClass</a>;
44<span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,44<span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
45 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);45 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);
46<a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,46<a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
47 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);47 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);
48<a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a>48<a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a>
49 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,49 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
50 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);50 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);
51<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-set-accel-group" title="dbusmenu_gtkclient_set_accel_group ()">dbusmenu_gtkclient_set_accel_group</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,51<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-set-accel-group" title="dbusmenu_gtkclient_set_accel_group ()">dbusmenu_gtkclient_set_accel_group</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
52 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="type">GtkAccelGroup</span></a> *agroup</code></em>);52 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="type">GtkAccelGroup</span></a> *agroup</code></em>);
53<a href="http://library.gnome.org/devel/gtk/unstable/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="returnvalue">GtkAccelGroup</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-get-accel-group" title="dbusmenu_gtkclient_get_accel_group ()">dbusmenu_gtkclient_get_accel_group</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>);53<a href="http://library.gnome.org/devel/gtk/2.22/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="returnvalue">GtkAccelGroup</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-get-accel-group" title="dbusmenu_gtkclient_get_accel_group ()">dbusmenu_gtkclient_get_accel_group</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>);
54<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,54<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-newitem-base" title="dbusmenu_gtkclient_newitem_base ()">dbusmenu_gtkclient_newitem_base</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
55 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>,55 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>,
56 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,56 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
57 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);57 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);
58</pre>58</pre>
59</div>59</div>
@@ -168,10 +168,10 @@
168<hr>168<hr>
169<div class="refsect2">169<div class="refsect2">
170<a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>170<a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>
171<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,171<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
172 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre>172 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre>
173<p>173<p>
174This grabs the <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the174This grabs the <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the
175 <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.175 <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
176</p>176</p>
177<div class="variablelist"><table border="0">177<div class="variablelist"><table border="0">
@@ -184,11 +184,11 @@
184<tr>184<tr>
185<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>185<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
186<td>186<td>
187<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on.</td>187<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on.</td>
188</tr>188</tr>
189<tr>189<tr>
190<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>190<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
191<td>The <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that can be played with.</td>191<td>The <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that can be played with.</td>
192</tr>192</tr>
193</tbody>193</tbody>
194</table></div>194</table></div>
@@ -196,7 +196,7 @@
196<hr>196<hr>
197<div class="refsect2">197<div class="refsect2">
198<a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>198<a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>
199<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu199<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu
200 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,200 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
201 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre>201 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);</pre>
202<p>202<p>
@@ -212,11 +212,11 @@
212<tr>212<tr>
213<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>213<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
214<td>214<td>
215<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="type">GtkMenu</span></a> on.</td>215<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to get associated <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> on.</td>
216</tr>216</tr>
217<tr>217<tr>
218<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>218<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
219<td>The <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="type">GtkMenu</span></a> if there is one.</td>219<td>The <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> if there is one.</td>
220</tr>220</tr>
221</tbody>221</tbody>
222</table></div>222</table></div>
@@ -225,7 +225,7 @@
225<div class="refsect2">225<div class="refsect2">
226<a name="dbusmenu-gtkclient-set-accel-group"></a><h3>dbusmenu_gtkclient_set_accel_group ()</h3>226<a name="dbusmenu-gtkclient-set-accel-group"></a><h3>dbusmenu_gtkclient_set_accel_group ()</h3>
227<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_set_accel_group (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,227<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_set_accel_group (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
228 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="type">GtkAccelGroup</span></a> *agroup</code></em>);</pre>228 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="type">GtkAccelGroup</span></a> *agroup</code></em>);</pre>
229<p>229<p>
230Sets the acceleration group for the menu items with accelerators230Sets the acceleration group for the menu items with accelerators
231 on this client.231 on this client.
@@ -247,7 +247,7 @@
247<hr>247<hr>
248<div class="refsect2">248<div class="refsect2">
249<a name="dbusmenu-gtkclient-get-accel-group"></a><h3>dbusmenu_gtkclient_get_accel_group ()</h3>249<a name="dbusmenu-gtkclient-get-accel-group"></a><h3>dbusmenu_gtkclient_get_accel_group ()</h3>
250<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="returnvalue">GtkAccelGroup</span></a> * dbusmenu_gtkclient_get_accel_group (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>);</pre>250<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/2.22/gtk3-Keyboard-Accelerators.html#GtkAccelGroup"><span class="returnvalue">GtkAccelGroup</span></a> * dbusmenu_gtkclient_get_accel_group (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>);</pre>
251<p>251<p>
252Gets the accel group for this client.252Gets the accel group for this client.
253</p>253</p>
@@ -271,7 +271,7 @@
271<a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>271<a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>
272<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,272<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
273 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>,273 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>,
274 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,274 <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
275 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>275 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *parent</code></em>);</pre>
276<p>276<p>
277This function provides some of the basic connectivity for being in277This function provides some of the basic connectivity for being in
@@ -297,7 +297,7 @@
297</tr>297</tr>
298<tr>298<tr>
299<td><p><span class="term"><em class="parameter"><code>gmi</code></em> :</span></p></td>299<td><p><span class="term"><em class="parameter"><code>gmi</code></em> :</span></p></td>
300<td>A <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> representing the GTK world's view of this menuitem</td>300<td>A <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> representing the GTK world's view of this menuitem</td>
301</tr>301</tr>
302<tr>302<tr>
303<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>303<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
304304
=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html'
--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2011-02-10 20:46:33 +0000
@@ -53,7 +53,7 @@
53 <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> *shortcut</code></em>);53 <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> *shortcut</code></em>);
54<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-shortcut-menuitem" title="dbusmenu_menuitem_property_set_shortcut_menuitem ()">dbusmenu_menuitem_property_set_shortcut_menuitem</a>54<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-shortcut-menuitem" title="dbusmenu_menuitem_property_set_shortcut_menuitem ()">dbusmenu_menuitem_property_set_shortcut_menuitem</a>
55 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,55 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,
56 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>);56 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>);
57<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-shortcut" title="dbusmenu_menuitem_property_get_shortcut ()">dbusmenu_menuitem_property_get_shortcut</a>57<span class="returnvalue">void</span> <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-shortcut" title="dbusmenu_menuitem_property_get_shortcut ()">dbusmenu_menuitem_property_get_shortcut</a>
58 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,58 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,
59 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *key</code></em>,59 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *key</code></em>,
@@ -172,7 +172,7 @@
172 <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> *shortcut</code></em>);</pre>172 <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> *shortcut</code></em>);</pre>
173<p>173<p>
174This function takes a GTK shortcut string as defined in174This function takes a GTK shortcut string as defined in
175 <a href="http://library.gnome.org/devel/gtk/unstable/gtk3-Keyboard-Accelerators.html#gtk-accelerator-parse"><span class="type">gtk_accelerator_parse</span></a> and turns that into the information175 <a href="http://library.gnome.org/devel/gtk/2.22/gtk3-Keyboard-Accelerators.html#gtk-accelerator-parse"><span class="type">gtk_accelerator_parse</span></a> and turns that into the information
176 required to send it over DBusmenu.176 required to send it over DBusmenu.
177</p>177</p>
178<div class="variablelist"><table border="0">178<div class="variablelist"><table border="0">
@@ -198,7 +198,7 @@
198<a name="dbusmenu-menuitem-property-set-shortcut-menuitem"></a><h3>dbusmenu_menuitem_property_set_shortcut_menuitem ()</h3>198<a name="dbusmenu-menuitem-property-set-shortcut-menuitem"></a><h3>dbusmenu_menuitem_property_set_shortcut_menuitem ()</h3>
199<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbusmenu_menuitem_property_set_shortcut_menuitem199<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbusmenu_menuitem_property_set_shortcut_menuitem
200 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,200 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *menuitem</code></em>,
201 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>);</pre>201 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>);</pre>
202<p>202<p>
203Takes the shortcut that is installed on a menu item and calls203Takes the shortcut that is installed on a menu item and calls
204 <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-shortcut" title="dbusmenu_menuitem_property_set_shortcut ()"><span class="type">dbusmenu_menuitem_property_set_shortcut</span></a> with it. It also sets204 <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-set-shortcut" title="dbusmenu_menuitem_property_set_shortcut ()"><span class="type">dbusmenu_menuitem_property_set_shortcut</span></a> with it. It also sets
205205
=== modified file 'docs/libdbusmenu-gtk/reference/html/object-tree.html'
--- docs/libdbusmenu-gtk/reference/html/object-tree.html 2011-01-27 20:19:46 +0000
+++ docs/libdbusmenu-gtk/reference/html/object-tree.html 2011-02-10 20:46:33 +0000
@@ -26,12 +26,12 @@
26 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>26 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
27 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>27 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
28 <a href="http://library.gnome.org/devel/gtk/unstable/GtkObject.html">GtkObject</a>28 <a href="http://library.gnome.org/devel/gtk/unstable/GtkObject.html">GtkObject</a>
29 <a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html">GtkWidget</a>29 <a href="http://library.gnome.org/devel/gtk/2.22/GtkWidget.html">GtkWidget</a>
30 <a href="http://library.gnome.org/devel/gtk/unstable/GtkContainer.html">GtkContainer</a>30 <a href="http://library.gnome.org/devel/gtk/2.22/GtkContainer.html">GtkContainer</a>
31 <a href="http://library.gnome.org/devel/gtk/unstable/GtkBin.html">GtkBin</a>31 <a href="http://library.gnome.org/devel/gtk/2.22/GtkBin.html">GtkBin</a>
32 <a href="http://library.gnome.org/devel/gtk/unstable/GtkItem.html">GtkItem</a>32 <a href="http://library.gnome.org/devel/gtk/unstable/GtkItem.html">GtkItem</a>
33 <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html">GtkMenuItem</a>33 <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html">GtkMenuItem</a>
34 <a href="http://library.gnome.org/devel/gtk/unstable/gtk3-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>34 <a href="http://library.gnome.org/devel/gtk/2.22/gtk3-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>
35 Genericmenuitem35 Genericmenuitem
36</pre>36</pre>
37</div>37</div>
3838
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2011-02-03 20:04:43 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2011-02-10 20:46:33 +0000
@@ -1,1 +1,1 @@
10.3.9610.3.97
22
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2011-01-27 20:20:28 +0000
+++ libdbusmenu-glib/Makefile.am 2011-02-10 20:46:33 +0000
@@ -138,18 +138,18 @@
138138
139introspection_sources = $(libdbusmenu_glibinclude_HEADERS)139introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
140140
141Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la141Dbusmenu-0.4.gir: libdbusmenu-glib.la
142Dbusmenu_Glib_0_4_gir_INCLUDES = \142Dbusmenu_0_4_gir_INCLUDES = \
143 GObject-2.0143 GObject-2.0
144Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)144Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
145Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la145Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
146Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))146Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
147Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu147Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
148Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4148Dbusmenu_0_4_gir_VERSION = 0.4
149Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4149Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
150Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)150Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
151151
152INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir152INTROSPECTION_GIRS += Dbusmenu-0.4.gir
153153
154girdir = $(datadir)/gir-1.0154girdir = $(datadir)/gir-1.0
155gir_DATA = $(INTROSPECTION_GIRS)155gir_DATA = $(INTROSPECTION_GIRS)
@@ -168,10 +168,10 @@
168if HAVE_INTROSPECTION168if HAVE_INTROSPECTION
169169
170vapidir = $(datadir)/vala/vapi170vapidir = $(datadir)/vala/vapi
171vapi_DATA = Dbusmenu-Glib-0.4.vapi171vapi_DATA = Dbusmenu-0.4.vapi
172172
173Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir173Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
174 $(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<174 $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
175175
176CLEANFILES += $(vapi_DATA)176CLEANFILES += $(vapi_DATA)
177177
178178
=== modified file 'libdbusmenu-glib/Makefile.in'
--- libdbusmenu-glib/Makefile.in 2011-01-27 20:20:28 +0000
+++ libdbusmenu-glib/Makefile.in 2011-02-10 20:46:33 +0000
@@ -36,7 +36,7 @@
36POST_UNINSTALL = :36POST_UNINSTALL = :
37build_triplet = @build@37build_triplet = @build@
38host_triplet = @host@38host_triplet = @host@
39@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.4.gir39@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-0.4.gir
40@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \40@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
41@HAVE_INTROSPECTION_TRUE@ $(vapi_DATA)41@HAVE_INTROSPECTION_TRUE@ $(vapi_DATA)
42subdir = libdbusmenu-glib42subdir = libdbusmenu-glib
@@ -376,16 +376,16 @@
376376
377INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)377INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
378@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS)378@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
379@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_INCLUDES = \379@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_INCLUDES = \
380@HAVE_INTROSPECTION_TRUE@ GObject-2.0380@HAVE_INTROSPECTION_TRUE@ GObject-2.0
381381
382@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)382@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
383@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la383@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
384@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))384@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
385@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu385@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
386@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4386@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_VERSION = 0.4
387@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4387@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
388@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)388@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
389@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0389@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
390@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)390@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
391@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0391@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
@@ -395,7 +395,7 @@
395# VAPI Files395# VAPI Files
396#########################396#########################
397@HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi397@HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
398@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.4.vapi398@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-0.4.vapi
399all: $(BUILT_SOURCES)399all: $(BUILT_SOURCES)
400 $(MAKE) $(AM_MAKEFLAGS) all-am400 $(MAKE) $(AM_MAKEFLAGS) all-am
401401
@@ -948,10 +948,10 @@
948948
949-include $(INTROSPECTION_MAKEFILE)949-include $(INTROSPECTION_MAKEFILE)
950950
951@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la951@HAVE_INTROSPECTION_TRUE@Dbusmenu-0.4.gir: libdbusmenu-glib.la
952952
953@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir953@HAVE_INTROSPECTION_TRUE@Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
954@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<954@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
955955
956# Tell versions [3.59,3.63) of GNU make to not export all variables.956# Tell versions [3.59,3.63) of GNU make to not export all variables.
957# Otherwise a system limit (for SysV at least) may be exceeded.957# Otherwise a system limit (for SysV at least) may be exceeded.
958958
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2011-01-27 20:13:18 +0000
+++ libdbusmenu-gtk/Makefile.am 2011-02-10 20:46:33 +0000
@@ -98,7 +98,7 @@
98DbusmenuGtk_0_4_gir_INCLUDES = \98DbusmenuGtk_0_4_gir_INCLUDES = \
99 GObject-2.0 \99 GObject-2.0 \
100 $(GTKGIR) \100 $(GTKGIR) \
101 Dbusmenu-Glib-0.4 101 Dbusmenu-0.4
102DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)102DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
103DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la103DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
104DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))104DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
@@ -141,7 +141,7 @@
141 --pkg gdk-pixbuf-2.0 \141 --pkg gdk-pixbuf-2.0 \
142 --pkg $(GTKVALA) \142 --pkg $(GTKVALA) \
143 --pkg atk \143 --pkg atk \
144 --pkg Dbusmenu-Glib-0.4 \144 --pkg Dbusmenu-0.4 \
145 --vapidir=$(top_builddir)/libdbusmenu-glib \145 --vapidir=$(top_builddir)/libdbusmenu-glib \
146 $<146 $<
147147
148148
=== modified file 'libdbusmenu-gtk/Makefile.in'
--- libdbusmenu-gtk/Makefile.in 2011-01-27 20:20:28 +0000
+++ libdbusmenu-gtk/Makefile.in 2011-02-10 20:46:33 +0000
@@ -394,7 +394,7 @@
394@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_INCLUDES = \394@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_INCLUDES = \
395@HAVE_INTROSPECTION_TRUE@ GObject-2.0 \395@HAVE_INTROSPECTION_TRUE@ GObject-2.0 \
396@HAVE_INTROSPECTION_TRUE@ $(GTKGIR) \396@HAVE_INTROSPECTION_TRUE@ $(GTKGIR) \
397@HAVE_INTROSPECTION_TRUE@ Dbusmenu-Glib-0.4 397@HAVE_INTROSPECTION_TRUE@ Dbusmenu-0.4
398398
399@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)399@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
400@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la400@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
@@ -990,7 +990,7 @@
990@HAVE_INTROSPECTION_TRUE@ --pkg gdk-pixbuf-2.0 \990@HAVE_INTROSPECTION_TRUE@ --pkg gdk-pixbuf-2.0 \
991@HAVE_INTROSPECTION_TRUE@ --pkg $(GTKVALA) \991@HAVE_INTROSPECTION_TRUE@ --pkg $(GTKVALA) \
992@HAVE_INTROSPECTION_TRUE@ --pkg atk \992@HAVE_INTROSPECTION_TRUE@ --pkg atk \
993@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-Glib-0.4 \993@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-0.4 \
994@HAVE_INTROSPECTION_TRUE@ --vapidir=$(top_builddir)/libdbusmenu-glib \994@HAVE_INTROSPECTION_TRUE@ --vapidir=$(top_builddir)/libdbusmenu-glib \
995@HAVE_INTROSPECTION_TRUE@ $<995@HAVE_INTROSPECTION_TRUE@ $<
996996

Subscribers

People subscribed via source and target branches

to all changes: