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
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-02-03 20:01:01 +0000
3+++ ChangeLog 2011-02-10 20:46:33 +0000
4@@ -1,5 +1,33 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-02-10 Ted Gould <ted@gould.cx>
8+
9+ 0.3.97
10+
11+2011-02-09 Ted Gould <ted@gould.cx>
12+
13+ Fixing the naming of the Dbusmenu Glib GIR file
14+
15+2011-02-09 Ken VanDine <ken.vandine@canonical.com>
16+
17+ 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)
18+
19+2011-02-06 Ted Gould <ted@gould.cx>
20+
21+ Fixing take to not unref
22+
23+2011-02-04 Ted Gould <ted@gould.cx>
24+
25+ 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.
26+
27+2011-02-04 Ted Gould <ted@gould.cx>
28+
29+ Handle ChildAdded on GtkShell items and clean up the code so that it has single functions for doing common operations.
30+
31+2011-02-04 Michael Terry <mike@mterry.name>
32+
33+ watch for new menu items being added to existing menu shells
34+
35 2011-02-03 Ted Gould <ted@gould.cx>
36
37 0.3.96
38
39=== modified file 'configure'
40--- configure 2011-02-03 20:04:43 +0000
41+++ configure 2011-02-10 20:46:33 +0000
42@@ -1,6 +1,6 @@
43 #! /bin/sh
44 # Guess values for system-dependent variables and create Makefiles.
45-# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.96.
46+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.97.
47 #
48 # Report bugs to <ted@canonical.com>.
49 #
50@@ -703,8 +703,8 @@
51 # Identity of this package.
52 PACKAGE_NAME='libdbusmenu'
53 PACKAGE_TARNAME='libdbusmenu'
54-PACKAGE_VERSION='0.3.96'
55-PACKAGE_STRING='libdbusmenu 0.3.96'
56+PACKAGE_VERSION='0.3.97'
57+PACKAGE_STRING='libdbusmenu 0.3.97'
58 PACKAGE_BUGREPORT='ted@canonical.com'
59 PACKAGE_URL=''
60
61@@ -1540,7 +1540,7 @@
62 # Omit some internal or obsolete options to make the list less imposing.
63 # This message is too long to be a string in the A/UX 3.1 sh.
64 cat <<_ACEOF
65-\`configure' configures libdbusmenu 0.3.96 to adapt to many kinds of systems.
66+\`configure' configures libdbusmenu 0.3.97 to adapt to many kinds of systems.
67
68 Usage: $0 [OPTION]... [VAR=VALUE]...
69
70@@ -1610,7 +1610,7 @@
71
72 if test -n "$ac_init_help"; then
73 case $ac_init_help in
74- short | recursive ) echo "Configuration of libdbusmenu 0.3.96:";;
75+ short | recursive ) echo "Configuration of libdbusmenu 0.3.97:";;
76 esac
77 cat <<\_ACEOF
78
79@@ -1750,7 +1750,7 @@
80 test -n "$ac_init_help" && exit $ac_status
81 if $ac_init_version; then
82 cat <<\_ACEOF
83-libdbusmenu configure 0.3.96
84+libdbusmenu configure 0.3.97
85 generated by GNU Autoconf 2.67
86
87 Copyright (C) 2010 Free Software Foundation, Inc.
88@@ -2121,7 +2121,7 @@
89 This file contains any messages produced by compilers while
90 running configure, to aid debugging if configure makes a mistake.
91
92-It was created by libdbusmenu $as_me 0.3.96, which was
93+It was created by libdbusmenu $as_me 0.3.97, which was
94 generated by GNU Autoconf 2.67. Invocation command line was
95
96 $ $0 $@
97@@ -2942,7 +2942,7 @@
98
99 # Define the identity of the package.
100 PACKAGE=libdbusmenu
101- VERSION=0.3.96
102+ VERSION=0.3.97
103
104
105 # Some tools Automake needs.
106@@ -13280,7 +13280,7 @@
107 ###########################
108
109 LIBDBUSMENU_CURRENT=3
110-LIBDBUSMENU_REVISION=4
111+LIBDBUSMENU_REVISION=5
112 LIBDBUSMENU_AGE=0
113
114
115@@ -14602,7 +14602,7 @@
116 # report actual input values of CONFIG_FILES etc. instead of their
117 # values after options handling.
118 ac_log="
119-This file was extended by libdbusmenu $as_me 0.3.96, which was
120+This file was extended by libdbusmenu $as_me 0.3.97, which was
121 generated by GNU Autoconf 2.67. Invocation command line was
122
123 CONFIG_FILES = $CONFIG_FILES
124@@ -14668,7 +14668,7 @@
125 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
126 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
127 ac_cs_version="\\
128-libdbusmenu config.status 0.3.96
129+libdbusmenu config.status 0.3.97
130 configured by $0, generated by GNU Autoconf 2.67,
131 with options \\"\$ac_cs_config\\"
132
133
134=== modified file 'configure.ac'
135--- configure.ac 2011-02-03 20:04:43 +0000
136+++ configure.ac 2011-02-10 20:46:33 +0000
137@@ -1,11 +1,11 @@
138
139-AC_INIT(libdbusmenu, 0.3.96, ted@canonical.com)
140+AC_INIT(libdbusmenu, 0.3.97, ted@canonical.com)
141 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
142
143 AC_PREREQ(2.62)
144
145 AM_CONFIG_HEADER(config.h)
146-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.96, [-Wno-portability])
147+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.97, [-Wno-portability])
148
149 AM_MAINTAINER_MODE
150
151@@ -136,7 +136,7 @@
152 ###########################
153
154 LIBDBUSMENU_CURRENT=3
155-LIBDBUSMENU_REVISION=4
156+LIBDBUSMENU_REVISION=5
157 LIBDBUSMENU_AGE=0
158
159 AC_SUBST(LIBDBUSMENU_CURRENT)
160
161=== modified file 'debian/changelog'
162--- debian/changelog 2011-02-07 14:51:35 +0000
163+++ debian/changelog 2011-02-10 20:46:33 +0000
164@@ -1,3 +1,18 @@
165+libdbusmenu (0.3.97-0ubuntu1~ppa1) natty; urgency=low
166+
167+ [Ted Gould]
168+ * New upstream release.
169+ ∘ Handle ChildAdded on GtkShell items (LP: #709839)
170+ ∘ Fixing take_children() to not unref
171+ ∘ Fix naming of the GIR file (LP: #713099)
172+
173+ [Ken VanDine]
174+ * debian/gir1.2-dbusmenu-glib-0.4.install,
175+ debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala
176+ file names
177+
178+ -- Ted Gould <ted@ubuntu.com> Thu, 10 Feb 2011 14:40:14 -0600
179+
180 libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
181
182 * libdbusmenu-gtk/parser.c
183
184=== modified file 'debian/gir1.2-dbusmenu-glib-0.4.install'
185--- debian/gir1.2-dbusmenu-glib-0.4.install 2011-01-06 03:53:31 +0000
186+++ debian/gir1.2-dbusmenu-glib-0.4.install 2011-02-10 20:46:33 +0000
187@@ -1,1 +1,1 @@
188-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
189+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib
190
191=== modified file 'debian/libdbusmenu-glib-dev.install'
192--- debian/libdbusmenu-glib-dev.install 2010-12-07 16:00:57 +0000
193+++ debian/libdbusmenu-glib-dev.install 2011-02-10 20:46:33 +0000
194@@ -2,5 +2,5 @@
195 debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
196 debian/tmp/usr/lib/libdbusmenu-glib.a
197 debian/tmp/usr/lib/libdbusmenu-glib.so
198-debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir
199-debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi
200+debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir
201+debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi
202
203=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
204--- docs/libdbusmenu-glib/reference/html/ch01.html 2011-02-03 20:01:01 +0000
205+++ docs/libdbusmenu-glib/reference/html/ch01.html 2011-02-10 20:46:33 +0000
206@@ -21,7 +21,7 @@
207 </tr></table>
208 <div class="chapter">
209 <div class="titlepage"><div><div><h2 class="title">
210-<a name="id450827"></a>API</h2></div></div></div>
211+<a name="id508273"></a>API</h2></div></div></div>
212 <div class="toc"><dl>
213 <dt>
214 <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
215
216=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
217--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-01-27 20:19:46 +0000
218+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-02-10 20:46:33 +0000
219@@ -624,7 +624,8 @@
220 </tr>
221 <tr>
222 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
223-<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>
224+<td>(transfer full) (array) (element-type Dbusmenu.Menuitem)
225+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>
226 </tr>
227 </tbody>
228 </table></div>
229
230=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
231--- docs/libdbusmenu-glib/reference/version.xml 2011-02-03 20:04:43 +0000
232+++ docs/libdbusmenu-glib/reference/version.xml 2011-02-10 20:46:33 +0000
233@@ -1,1 +1,1 @@
234-0.3.96
235+0.3.97
236
237=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
238--- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-01-27 20:19:46 +0000
239+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-02-10 20:46:33 +0000
240@@ -499,7 +499,8 @@
241 </para><variablelist role="params">
242 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
243 <listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.</simpara></listitem></varlistentry>
244-<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>
245+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>(transfer full) (array) (element-type Dbusmenu.Menuitem)
246+A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.</simpara></listitem></varlistentry>
247 </variablelist></refsect2>
248 <refsect2 id="dbusmenu-menuitem-get-position" role="function">
249 <title>dbusmenu_menuitem_get_position ()</title>
250
251=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html'
252--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2011-01-27 20:19:46 +0000
253+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2011-02-10 20:46:33 +0000
254@@ -43,17 +43,17 @@
255 struct <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#DbusmenuGtkClientClass" title="struct DbusmenuGtkClientClass">DbusmenuGtkClientClass</a>;
256 <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>,
257 <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>);
258-<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>,
259+<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>,
260 <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>);
261-<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>
262+<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>
263 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
264 <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>);
265 <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>,
266- <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>);
267-<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>);
268+ <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>);
269+<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>);
270 <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>,
271 <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>,
272- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
273+ <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>,
274 <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>);
275 </pre>
276 </div>
277@@ -168,10 +168,10 @@
278 <hr>
279 <div class="refsect2">
280 <a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>
281-<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>,
282+<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>,
283 <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>
284 <p>
285-This grabs the <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the
286+This 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
287 <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
288 </p>
289 <div class="variablelist"><table border="0">
290@@ -184,11 +184,11 @@
291 <tr>
292 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
293 <td>
294-<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>
295+<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>
296 </tr>
297 <tr>
298 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
299-<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>
300+<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>
301 </tr>
302 </tbody>
303 </table></div>
304@@ -196,7 +196,7 @@
305 <hr>
306 <div class="refsect2">
307 <a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>
308-<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu
309+<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
310 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
311 <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>
312 <p>
313@@ -212,11 +212,11 @@
314 <tr>
315 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
316 <td>
317-<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>
318+<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>
319 </tr>
320 <tr>
321 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
322-<td>The <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="type">GtkMenu</span></a> if there is one.</td>
323+<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>
324 </tr>
325 </tbody>
326 </table></div>
327@@ -225,7 +225,7 @@
328 <div class="refsect2">
329 <a name="dbusmenu-gtkclient-set-accel-group"></a><h3>dbusmenu_gtkclient_set_accel_group ()</h3>
330 <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>,
331- <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>
332+ <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>
333 <p>
334 Sets the acceleration group for the menu items with accelerators
335 on this client.
336@@ -247,7 +247,7 @@
337 <hr>
338 <div class="refsect2">
339 <a name="dbusmenu-gtkclient-get-accel-group"></a><h3>dbusmenu_gtkclient_get_accel_group ()</h3>
340-<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>
341+<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>
342 <p>
343 Gets the accel group for this client.
344 </p>
345@@ -271,7 +271,7 @@
346 <a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>
347 <pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
348 <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>,
349- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
350+ <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>,
351 <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>
352 <p>
353 This function provides some of the basic connectivity for being in
354@@ -297,7 +297,7 @@
355 </tr>
356 <tr>
357 <td><p><span class="term"><em class="parameter"><code>gmi</code></em> :</span></p></td>
358-<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>
359+<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>
360 </tr>
361 <tr>
362 <td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
363
364=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html'
365--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2011-01-27 20:19:46 +0000
366+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2011-02-10 20:46:33 +0000
367@@ -53,7 +53,7 @@
368 <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>);
369 <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>
370 (<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>,
371- <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>);
372+ <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>);
373 <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>
374 (<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>,
375 <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>,
376@@ -172,7 +172,7 @@
377 <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>
378 <p>
379 This function takes a GTK shortcut string as defined in
380- <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 information
381+ <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
382 required to send it over DBusmenu.
383 </p>
384 <div class="variablelist"><table border="0">
385@@ -198,7 +198,7 @@
386 <a name="dbusmenu-menuitem-property-set-shortcut-menuitem"></a><h3>dbusmenu_menuitem_property_set_shortcut_menuitem ()</h3>
387 <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
388 (<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>,
389- <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>
390+ <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>
391 <p>
392 Takes the shortcut that is installed on a menu item and calls
393 <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
394
395=== modified file 'docs/libdbusmenu-gtk/reference/html/object-tree.html'
396--- docs/libdbusmenu-gtk/reference/html/object-tree.html 2011-01-27 20:19:46 +0000
397+++ docs/libdbusmenu-gtk/reference/html/object-tree.html 2011-02-10 20:46:33 +0000
398@@ -26,12 +26,12 @@
399 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
400 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
401 <a href="http://library.gnome.org/devel/gtk/unstable/GtkObject.html">GtkObject</a>
402- <a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html">GtkWidget</a>
403- <a href="http://library.gnome.org/devel/gtk/unstable/GtkContainer.html">GtkContainer</a>
404- <a href="http://library.gnome.org/devel/gtk/unstable/GtkBin.html">GtkBin</a>
405+ <a href="http://library.gnome.org/devel/gtk/2.22/GtkWidget.html">GtkWidget</a>
406+ <a href="http://library.gnome.org/devel/gtk/2.22/GtkContainer.html">GtkContainer</a>
407+ <a href="http://library.gnome.org/devel/gtk/2.22/GtkBin.html">GtkBin</a>
408 <a href="http://library.gnome.org/devel/gtk/unstable/GtkItem.html">GtkItem</a>
409- <a href="http://library.gnome.org/devel/gtk/unstable/GtkMenuItem.html">GtkMenuItem</a>
410- <a href="http://library.gnome.org/devel/gtk/unstable/gtk3-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>
411+ <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenuItem.html">GtkMenuItem</a>
412+ <a href="http://library.gnome.org/devel/gtk/2.22/gtk3-gtkcheckmenuitem.html#GtkCheckMenuItem">GtkCheckMenuItem</a>
413 Genericmenuitem
414 </pre>
415 </div>
416
417=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
418--- docs/libdbusmenu-gtk/reference/version.xml 2011-02-03 20:04:43 +0000
419+++ docs/libdbusmenu-gtk/reference/version.xml 2011-02-10 20:46:33 +0000
420@@ -1,1 +1,1 @@
421-0.3.96
422+0.3.97
423
424=== modified file 'libdbusmenu-glib/Makefile.am'
425--- libdbusmenu-glib/Makefile.am 2011-01-27 20:20:28 +0000
426+++ libdbusmenu-glib/Makefile.am 2011-02-10 20:46:33 +0000
427@@ -138,18 +138,18 @@
428
429 introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
430
431-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
432-Dbusmenu_Glib_0_4_gir_INCLUDES = \
433+Dbusmenu-0.4.gir: libdbusmenu-glib.la
434+Dbusmenu_0_4_gir_INCLUDES = \
435 GObject-2.0
436-Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
437-Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
438-Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
439-Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
440-Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
441-Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
442-Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
443+Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
444+Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
445+Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
446+Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
447+Dbusmenu_0_4_gir_VERSION = 0.4
448+Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
449+Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
450
451-INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir
452+INTROSPECTION_GIRS += Dbusmenu-0.4.gir
453
454 girdir = $(datadir)/gir-1.0
455 gir_DATA = $(INTROSPECTION_GIRS)
456@@ -168,10 +168,10 @@
457 if HAVE_INTROSPECTION
458
459 vapidir = $(datadir)/vala/vapi
460-vapi_DATA = Dbusmenu-Glib-0.4.vapi
461+vapi_DATA = Dbusmenu-0.4.vapi
462
463-Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
464- $(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
465+Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
466+ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
467
468 CLEANFILES += $(vapi_DATA)
469
470
471=== modified file 'libdbusmenu-glib/Makefile.in'
472--- libdbusmenu-glib/Makefile.in 2011-01-27 20:20:28 +0000
473+++ libdbusmenu-glib/Makefile.in 2011-02-10 20:46:33 +0000
474@@ -36,7 +36,7 @@
475 POST_UNINSTALL = :
476 build_triplet = @build@
477 host_triplet = @host@
478-@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-Glib-0.4.gir
479+@HAVE_INTROSPECTION_TRUE@am__append_1 = Dbusmenu-0.4.gir
480 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
481 @HAVE_INTROSPECTION_TRUE@ $(vapi_DATA)
482 subdir = libdbusmenu-glib
483@@ -376,16 +376,16 @@
484
485 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
486 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
487-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_INCLUDES = \
488+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_INCLUDES = \
489 @HAVE_INTROSPECTION_TRUE@ GObject-2.0
490
491-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
492-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
493-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
494-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
495-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
496-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
497-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
498+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
499+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
500+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
501+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
502+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_VERSION = 0.4
503+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
504+@HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
505 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
506 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
507 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
508@@ -395,7 +395,7 @@
509 # VAPI Files
510 #########################
511 @HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
512-@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-Glib-0.4.vapi
513+@HAVE_INTROSPECTION_TRUE@vapi_DATA = Dbusmenu-0.4.vapi
514 all: $(BUILT_SOURCES)
515 $(MAKE) $(AM_MAKEFLAGS) all-am
516
517@@ -948,10 +948,10 @@
518
519 -include $(INTROSPECTION_MAKEFILE)
520
521-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
522+@HAVE_INTROSPECTION_TRUE@Dbusmenu-0.4.gir: libdbusmenu-glib.la
523
524-@HAVE_INTROSPECTION_TRUE@Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
525-@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
526+@HAVE_INTROSPECTION_TRUE@Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
527+@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=Dbusmenu-0.4 $<
528
529 # Tell versions [3.59,3.63) of GNU make to not export all variables.
530 # Otherwise a system limit (for SysV at least) may be exceeded.
531
532=== modified file 'libdbusmenu-gtk/Makefile.am'
533--- libdbusmenu-gtk/Makefile.am 2011-01-27 20:13:18 +0000
534+++ libdbusmenu-gtk/Makefile.am 2011-02-10 20:46:33 +0000
535@@ -98,7 +98,7 @@
536 DbusmenuGtk_0_4_gir_INCLUDES = \
537 GObject-2.0 \
538 $(GTKGIR) \
539- Dbusmenu-Glib-0.4
540+ Dbusmenu-0.4
541 DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
542 DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
543 DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
544@@ -141,7 +141,7 @@
545 --pkg gdk-pixbuf-2.0 \
546 --pkg $(GTKVALA) \
547 --pkg atk \
548- --pkg Dbusmenu-Glib-0.4 \
549+ --pkg Dbusmenu-0.4 \
550 --vapidir=$(top_builddir)/libdbusmenu-glib \
551 $<
552
553
554=== modified file 'libdbusmenu-gtk/Makefile.in'
555--- libdbusmenu-gtk/Makefile.in 2011-01-27 20:20:28 +0000
556+++ libdbusmenu-gtk/Makefile.in 2011-02-10 20:46:33 +0000
557@@ -394,7 +394,7 @@
558 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_INCLUDES = \
559 @HAVE_INTROSPECTION_TRUE@ GObject-2.0 \
560 @HAVE_INTROSPECTION_TRUE@ $(GTKGIR) \
561-@HAVE_INTROSPECTION_TRUE@ Dbusmenu-Glib-0.4
562+@HAVE_INTROSPECTION_TRUE@ Dbusmenu-0.4
563
564 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
565 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
566@@ -990,7 +990,7 @@
567 @HAVE_INTROSPECTION_TRUE@ --pkg gdk-pixbuf-2.0 \
568 @HAVE_INTROSPECTION_TRUE@ --pkg $(GTKVALA) \
569 @HAVE_INTROSPECTION_TRUE@ --pkg atk \
570-@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-Glib-0.4 \
571+@HAVE_INTROSPECTION_TRUE@ --pkg Dbusmenu-0.4 \
572 @HAVE_INTROSPECTION_TRUE@ --vapidir=$(top_builddir)/libdbusmenu-glib \
573 @HAVE_INTROSPECTION_TRUE@ $<
574

Subscribers

People subscribed via source and target branches

to all changes: