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: 135
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 748 lines (+245/-55)
24 files modified
AUTHORS (+1/-0)
ChangeLog (+52/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+11/-0)
docs/libdbusmenu-glib/reference/html/api-index-full.html (+12/-0)
docs/libdbusmenu-glib/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-glib/reference/html/index.sgml (+3/-0)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html (+35/-0)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp (+3/-0)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 (+3/-0)
docs/libdbusmenu-glib/reference/tmpl/client.sgml (+0/-2)
docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml (+0/-2)
docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml (+21/-2)
docs/libdbusmenu-glib/reference/tmpl/server.sgml (+0/-2)
docs/libdbusmenu-glib/reference/tmpl/types.sgml (+0/-2)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-glib/reference/xml/api-index-full.xml (+3/-0)
docs/libdbusmenu-glib/reference/xml/menuitem.xml (+32/-0)
docs/libdbusmenu-gtk/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-glib/client.c (+40/-25)
libdbusmenu-gtk/menuitem.c (+9/-2)
libdbusmenu-gtk/parser.c (+2/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+54593@code.launchpad.net
To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
135. By Ken VanDine

releasing version 0.4.0-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2011-02-24 21:04:39 +0000
3+++ AUTHORS 2011-03-23 20:03:35 +0000
4@@ -12,6 +12,7 @@
5 Martin Pitt
6 Mathieu Trudel-Lapierre
7 Michael Terry
8+ Oleg Shparber
9 Robert Collins
10 seb128
11 Sebastien Bacher
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-03-16 19:01:25 +0000
15+++ ChangeLog 2011-03-23 20:03:35 +0000
16@@ -1,5 +1,57 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-03-23 Ted Gould <ted@gould.cx>
20+
21+ 0.4.0
22+
23+2011-03-23 Ted Gould <ted@gould.cx>
24+
25+ Ensure that we don't remove properties that are getting their values updated
26+
27+2011-03-22 Ted Gould <ted@gould.cx>
28+
29+ Protect against NULL properties
30+
31+2011-03-22 Ted Gould <ted@gould.cx>
32+
33+ Remove the link instead of the data
34+
35+2011-03-22 Ted Gould <ted@gould.cx>
36+
37+ Protect the entries that are about to be updated from being removed
38+
39+2011-03-23 Ted Gould <ted@gould.cx>
40+
41+ Switch to using iter_loop to protect from NULL variants
42+
43+2011-03-21 Ted Gould <ted@gould.cx>
44+
45+ A couple more intr_loops with a small memory leak fix
46+
47+2011-03-21 Ted Gould <ted@gould.cx>
48+
49+ Moving from iter_next to iter_loop on a couple more iterators
50+
51+2011-03-21 Ted Gould <ted@gould.cx>
52+
53+ Removing an unneeded iner_new
54+
55+2011-03-21 Ted Gould <ted@gould.cx>
56+
57+ Use iter_loop to handle unref'ing the variants cleanly.
58+
59+2011-03-22 Ted Gould <ted@gould.cx>
60+
61+ Look everywhere for accel closures
62+
63+2011-03-21 Michael Terry <mike@mterry.name>
64+
65+ check menu items for accelerators directly if accel label doesn't have one
66+
67+2011-03-21 Oleg Shparber <oleg.shparber@wisetroll.com>
68+
69+ Entering and exiting the GDK threads when calling up to GTK
70+
71 2011-03-16 Ted Gould <ted@gould.cx>
72
73 0.3.102
74
75=== modified file 'configure'
76--- configure 2011-03-16 19:02:13 +0000
77+++ configure 2011-03-23 20:03:35 +0000
78@@ -1,6 +1,6 @@
79 #! /bin/sh
80 # Guess values for system-dependent variables and create Makefiles.
81-# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.102.
82+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.0.
83 #
84 # Report bugs to <ted@canonical.com>.
85 #
86@@ -703,8 +703,8 @@
87 # Identity of this package.
88 PACKAGE_NAME='libdbusmenu'
89 PACKAGE_TARNAME='libdbusmenu'
90-PACKAGE_VERSION='0.3.102'
91-PACKAGE_STRING='libdbusmenu 0.3.102'
92+PACKAGE_VERSION='0.4.0'
93+PACKAGE_STRING='libdbusmenu 0.4.0'
94 PACKAGE_BUGREPORT='ted@canonical.com'
95 PACKAGE_URL=''
96
97@@ -1541,7 +1541,7 @@
98 # Omit some internal or obsolete options to make the list less imposing.
99 # This message is too long to be a string in the A/UX 3.1 sh.
100 cat <<_ACEOF
101-\`configure' configures libdbusmenu 0.3.102 to adapt to many kinds of systems.
102+\`configure' configures libdbusmenu 0.4.0 to adapt to many kinds of systems.
103
104 Usage: $0 [OPTION]... [VAR=VALUE]...
105
106@@ -1611,7 +1611,7 @@
107
108 if test -n "$ac_init_help"; then
109 case $ac_init_help in
110- short | recursive ) echo "Configuration of libdbusmenu 0.3.102:";;
111+ short | recursive ) echo "Configuration of libdbusmenu 0.4.0:";;
112 esac
113 cat <<\_ACEOF
114
115@@ -1751,7 +1751,7 @@
116 test -n "$ac_init_help" && exit $ac_status
117 if $ac_init_version; then
118 cat <<\_ACEOF
119-libdbusmenu configure 0.3.102
120+libdbusmenu configure 0.4.0
121 generated by GNU Autoconf 2.67
122
123 Copyright (C) 2010 Free Software Foundation, Inc.
124@@ -2122,7 +2122,7 @@
125 This file contains any messages produced by compilers while
126 running configure, to aid debugging if configure makes a mistake.
127
128-It was created by libdbusmenu $as_me 0.3.102, which was
129+It was created by libdbusmenu $as_me 0.4.0, which was
130 generated by GNU Autoconf 2.67. Invocation command line was
131
132 $ $0 $@
133@@ -2943,7 +2943,7 @@
134
135 # Define the identity of the package.
136 PACKAGE=libdbusmenu
137- VERSION=0.3.102
138+ VERSION=0.4.0
139
140
141 # Some tools Automake needs.
142@@ -13294,7 +13294,7 @@
143 ###########################
144
145 LIBDBUSMENU_CURRENT=3
146-LIBDBUSMENU_REVISION=10
147+LIBDBUSMENU_REVISION=11
148 LIBDBUSMENU_AGE=0
149
150
151@@ -14616,7 +14616,7 @@
152 # report actual input values of CONFIG_FILES etc. instead of their
153 # values after options handling.
154 ac_log="
155-This file was extended by libdbusmenu $as_me 0.3.102, which was
156+This file was extended by libdbusmenu $as_me 0.4.0, which was
157 generated by GNU Autoconf 2.67. Invocation command line was
158
159 CONFIG_FILES = $CONFIG_FILES
160@@ -14682,7 +14682,7 @@
161 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
162 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
163 ac_cs_version="\\
164-libdbusmenu config.status 0.3.102
165+libdbusmenu config.status 0.4.0
166 configured by $0, generated by GNU Autoconf 2.67,
167 with options \\"\$ac_cs_config\\"
168
169
170=== modified file 'configure.ac'
171--- configure.ac 2011-03-16 19:02:13 +0000
172+++ configure.ac 2011-03-23 20:03:35 +0000
173@@ -1,11 +1,11 @@
174
175-AC_INIT(libdbusmenu, 0.3.102, ted@canonical.com)
176+AC_INIT(libdbusmenu, 0.4.0, ted@canonical.com)
177 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
178
179 AC_PREREQ(2.62)
180
181 AM_CONFIG_HEADER(config.h)
182-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.102, [-Wno-portability])
183+AM_INIT_AUTOMAKE(libdbusmenu, 0.4.0, [-Wno-portability])
184
185 AM_MAINTAINER_MODE
186
187@@ -134,7 +134,7 @@
188 ###########################
189
190 LIBDBUSMENU_CURRENT=3
191-LIBDBUSMENU_REVISION=10
192+LIBDBUSMENU_REVISION=11
193 LIBDBUSMENU_AGE=0
194
195 AC_SUBST(LIBDBUSMENU_CURRENT)
196
197=== modified file 'debian/changelog'
198--- debian/changelog 2011-03-16 19:53:11 +0000
199+++ debian/changelog 2011-03-23 20:03:35 +0000
200@@ -1,3 +1,14 @@
201+libdbusmenu (0.4.0-0ubuntu1~ppa1) natty; urgency=low
202+
203+ * New upstream release.
204+ * Protect from NULL variants by using iter_loop (LP: #737844)
205+ * Look for accellerators inside the labels as well
206+ * Protecting properties that are getting updated from an
207+ extra remove signal. (LP: #730925)
208+ * Enter and exit the GDK threads before calling GTK (LP: #717162)
209+
210+ -- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 14:56:24 -0500
211+
212 libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low
213
214 * New upstream release.
215
216=== modified file 'docs/libdbusmenu-glib/reference/html/api-index-full.html'
217--- docs/libdbusmenu-glib/reference/html/api-index-full.html 2011-03-10 17:03:04 +0000
218+++ docs/libdbusmenu-glib/reference/html/api-index-full.html 2011-03-23 20:03:35 +0000
219@@ -180,6 +180,18 @@
220 </dt>
221 <dd></dd>
222 <dt>
223+<a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_EVENT_ACTIVATED">DBUSMENU_MENUITEM_EVENT_ACTIVATED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
224+</dt>
225+<dd></dd>
226+<dt>
227+<a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" title="DBUSMENU_MENUITEM_EVENT_CLOSED">DBUSMENU_MENUITEM_EVENT_CLOSED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
228+</dt>
229+<dd></dd>
230+<dt>
231+<a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" title="DBUSMENU_MENUITEM_EVENT_OPENED">DBUSMENU_MENUITEM_EVENT_OPENED</a>, macro in <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
232+</dt>
233+<dd></dd>
234+<dt>
235 <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-find-id" title="dbusmenu_menuitem_find_id ()">dbusmenu_menuitem_find_id</a>, function in <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html" title="DbusmenuMenuitem">DbusmenuMenuitem</a>
236 </dt>
237 <dd></dd>
238
239=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
240--- docs/libdbusmenu-glib/reference/html/ch01.html 2011-03-10 17:03:04 +0000
241+++ docs/libdbusmenu-glib/reference/html/ch01.html 2011-03-23 20:03:35 +0000
242@@ -21,7 +21,7 @@
243 </tr></table>
244 <div class="chapter">
245 <div class="titlepage"><div><div><h2 class="title">
246-<a name="id325831"></a>API</h2></div></div></div>
247+<a name="id440860"></a>API</h2></div></div></div>
248 <div class="toc"><dl>
249 <dt>
250 <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
251
252=== modified file 'docs/libdbusmenu-glib/reference/html/index.sgml'
253--- docs/libdbusmenu-glib/reference/html/index.sgml 2011-03-10 17:03:04 +0000
254+++ docs/libdbusmenu-glib/reference/html/index.sgml 2011-03-23 20:03:35 +0000
255@@ -66,6 +66,9 @@
256 <ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">
257 <ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">
258 <ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">
259+<ANCHOR id="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS">
260+<ANCHOR id="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS">
261+<ANCHOR id="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS">
262 <ANCHOR id="DbusmenuMenuitem" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem">
263 <ANCHOR id="dbusmenu-menuitem-about-to-show-cb" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb">
264 <ANCHOR id="dbusmenu-menuitem-buildvariant-slot-t" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t">
265
266=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
267--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-03-10 17:03:04 +0000
268+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-03-23 20:03:35 +0000
269@@ -75,6 +75,9 @@
270 #define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_CONTROL">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</a>
271 #define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SHIFT">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</a>
272 #define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SUPER">DBUSMENU_MENUITEM_SHORTCUT_SUPER</a>
273+#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_EVENT_ACTIVATED">DBUSMENU_MENUITEM_EVENT_ACTIVATED</a>
274+#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" title="DBUSMENU_MENUITEM_EVENT_CLOSED">DBUSMENU_MENUITEM_EVENT_CLOSED</a>
275+#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" title="DBUSMENU_MENUITEM_EVENT_OPENED">DBUSMENU_MENUITEM_EVENT_OPENED</a>
276 struct <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem">DbusmenuMenuitem</a>;
277 <span class="returnvalue">void</span> (<a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb" title="dbusmenu_menuitem_about_to_show_cb ()">*dbusmenu_menuitem_about_to_show_cb</a>)
278 (<em class="parameter"><code><a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *mi</code></em>,
279@@ -493,6 +496,38 @@
280 </div>
281 <hr>
282 <div class="refsect2">
283+<a name="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_ACTIVATED</h3>
284+<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked"
285+</pre>
286+<p>
287+String for the event identifier when a menu item is clicked
288+on by the user.
289+</p>
290+</div>
291+<hr>
292+<div class="refsect2">
293+<a name="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_CLOSED</h3>
294+<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_CLOSED "closed"
295+</pre>
296+<p>
297+String for the event identifier when a menu is closed and
298+displayed to the user. Only valid for items that contain
299+submenus.
300+</p>
301+</div>
302+<hr>
303+<div class="refsect2">
304+<a name="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_OPENED</h3>
305+<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_OPENED "opened"
306+</pre>
307+<p>
308+String for the event identifier when a menu is opened and
309+displayed to the user. Only valid for items that contain
310+submenus.
311+</p>
312+</div>
313+<hr>
314+<div class="refsect2">
315 <a name="DbusmenuMenuitem"></a><h3>struct DbusmenuMenuitem</h3>
316 <pre class="programlisting">struct DbusmenuMenuitem {
317 GObject parent;
318
319=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp'
320--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp 2011-03-10 17:03:04 +0000
321+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp 2011-03-23 20:03:35 +0000
322@@ -68,6 +68,9 @@
323 <function name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>
324 <function name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>
325 <function name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>
326+ <function name="DBUSMENU_MENUITEM_EVENT_ACTIVATED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"/>
327+ <function name="DBUSMENU_MENUITEM_EVENT_CLOSED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"/>
328+ <function name="DBUSMENU_MENUITEM_EVENT_OPENED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"/>
329 <function name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>
330 <function name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
331 <function name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>
332
333=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2'
334--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 2011-03-10 17:03:04 +0000
335+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 2011-03-23 20:03:35 +0000
336@@ -68,6 +68,9 @@
337 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>
338 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>
339 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>
340+ <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_ACTIVATED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"/>
341+ <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_CLOSED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"/>
342+ <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_OPENED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"/>
343 <keyword type="struct" name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>
344 <keyword type="function" name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
345 <keyword type="function" name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>
346
347=== modified file 'docs/libdbusmenu-glib/reference/tmpl/client.sgml'
348--- docs/libdbusmenu-glib/reference/tmpl/client.sgml 2011-03-10 17:03:04 +0000
349+++ docs/libdbusmenu-glib/reference/tmpl/client.sgml 2011-03-23 20:03:35 +0000
350@@ -9,13 +9,11 @@
351
352 </para>
353
354-
355 <!-- ##### SECTION See_Also ##### -->
356 <para>
357
358 </para>
359
360-
361 <!-- ##### SECTION Stability_Level ##### -->
362
363
364
365=== modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml'
366--- docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2011-03-10 17:03:04 +0000
367+++ docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2011-03-23 20:03:35 +0000
368@@ -9,13 +9,11 @@
369
370 </para>
371
372-
373 <!-- ##### SECTION See_Also ##### -->
374 <para>
375
376 </para>
377
378-
379 <!-- ##### SECTION Stability_Level ##### -->
380
381
382
383=== modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml'
384--- docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2011-03-10 17:03:04 +0000
385+++ docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2011-03-23 20:03:35 +0000
386@@ -9,13 +9,11 @@
387
388 </para>
389
390-
391 <!-- ##### SECTION See_Also ##### -->
392 <para>
393
394 </para>
395
396-
397 <!-- ##### SECTION Stability_Level ##### -->
398
399
400@@ -239,6 +237,27 @@
401
402
403
404+<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_ACTIVATED ##### -->
405+<para>
406+
407+</para>
408+
409+
410+
411+<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_CLOSED ##### -->
412+<para>
413+
414+</para>
415+
416+
417+
418+<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_OPENED ##### -->
419+<para>
420+
421+</para>
422+
423+
424+
425 <!-- ##### STRUCT DbusmenuMenuitem ##### -->
426 <para>
427
428
429=== modified file 'docs/libdbusmenu-glib/reference/tmpl/server.sgml'
430--- docs/libdbusmenu-glib/reference/tmpl/server.sgml 2011-03-10 17:03:04 +0000
431+++ docs/libdbusmenu-glib/reference/tmpl/server.sgml 2011-03-23 20:03:35 +0000
432@@ -9,13 +9,11 @@
433
434 </para>
435
436-
437 <!-- ##### SECTION See_Also ##### -->
438 <para>
439
440 </para>
441
442-
443 <!-- ##### SECTION Stability_Level ##### -->
444
445
446
447=== modified file 'docs/libdbusmenu-glib/reference/tmpl/types.sgml'
448--- docs/libdbusmenu-glib/reference/tmpl/types.sgml 2011-03-10 17:03:04 +0000
449+++ docs/libdbusmenu-glib/reference/tmpl/types.sgml 2011-03-23 20:03:35 +0000
450@@ -9,13 +9,11 @@
451
452 </para>
453
454-
455 <!-- ##### SECTION See_Also ##### -->
456 <para>
457
458 </para>
459
460-
461 <!-- ##### SECTION Stability_Level ##### -->
462
463
464
465=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
466--- docs/libdbusmenu-glib/reference/version.xml 2011-03-16 19:02:13 +0000
467+++ docs/libdbusmenu-glib/reference/version.xml 2011-03-23 20:03:35 +0000
468@@ -1,1 +1,1 @@
469-0.3.102
470+0.4.0
471
472=== modified file 'docs/libdbusmenu-glib/reference/xml/api-index-full.xml'
473--- docs/libdbusmenu-glib/reference/xml/api-index-full.xml 2011-03-10 17:03:04 +0000
474+++ docs/libdbusmenu-glib/reference/xml/api-index-full.xml 2011-03-23 20:03:35 +0000
475@@ -44,6 +44,9 @@
476 <indexentry><primaryie linkends="dbusmenu-menuitem-child-find"><link linkend="dbusmenu-menuitem-child-find">dbusmenu_menuitem_child_find</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
477 <indexentry><primaryie linkends="dbusmenu-menuitem-child-prepend"><link linkend="dbusmenu-menuitem-child-prepend">dbusmenu_menuitem_child_prepend</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
478 <indexentry><primaryie linkends="dbusmenu-menuitem-child-reorder"><link linkend="dbusmenu-menuitem-child-reorder">dbusmenu_menuitem_child_reorder</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
479+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"><link linkend="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS">DBUSMENU_MENUITEM_EVENT_ACTIVATED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
480+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"><link linkend="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS">DBUSMENU_MENUITEM_EVENT_CLOSED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
481+<indexentry><primaryie linkends="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"><link linkend="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS">DBUSMENU_MENUITEM_EVENT_OPENED</link>, macro in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
482 <indexentry><primaryie linkends="dbusmenu-menuitem-find-id"><link linkend="dbusmenu-menuitem-find-id">dbusmenu_menuitem_find_id</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
483 <indexentry><primaryie linkends="dbusmenu-menuitem-foreach"><link linkend="dbusmenu-menuitem-foreach">dbusmenu_menuitem_foreach</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
484 <indexentry><primaryie linkends="dbusmenu-menuitem-get-children"><link linkend="dbusmenu-menuitem-get-children">dbusmenu_menuitem_get_children</link>, function in <link linkend="libdbusmenu-glib-DbusmenuMenuitem">DbusmenuMenuitem</link></primaryie></indexentry>
485
486=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
487--- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-03-10 17:03:04 +0000
488+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-03-23 20:03:35 +0000
489@@ -58,6 +58,9 @@
490 #define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</link>
491 #define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</link>
492 #define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SUPER</link>
493+#define <link linkend="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS">DBUSMENU_MENUITEM_EVENT_ACTIVATED</link>
494+#define <link linkend="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS">DBUSMENU_MENUITEM_EVENT_CLOSED</link>
495+#define <link linkend="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS">DBUSMENU_MENUITEM_EVENT_OPENED</link>
496 struct <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>;
497 <link linkend="void"><returnvalue>void</returnvalue></link> (<link linkend="dbusmenu-menuitem-about-to-show-cb">*dbusmenu_menuitem_about_to_show_cb</link>)
498 (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
499@@ -445,6 +448,35 @@
500 Used in <link linkend="DBUSMENU-MENUITEM-PROP-SHORTCUT:CAPS"><type>DBUSMENU_MENUITEM_PROP_SHORTCUT</type></link> to represent the
501 super key.
502 </para></refsect2>
503+<refsect2 id="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" role="macro">
504+<title>DBUSMENU_MENUITEM_EVENT_ACTIVATED</title>
505+<indexterm zone="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_ACTIVATED</primary></indexterm>
506+<programlisting>#define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked"
507+</programlisting>
508+<para>
509+String for the event identifier when a menu item is clicked
510+on by the user.
511+</para></refsect2>
512+<refsect2 id="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" role="macro">
513+<title>DBUSMENU_MENUITEM_EVENT_CLOSED</title>
514+<indexterm zone="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_CLOSED</primary></indexterm>
515+<programlisting>#define DBUSMENU_MENUITEM_EVENT_CLOSED "closed"
516+</programlisting>
517+<para>
518+String for the event identifier when a menu is closed and
519+displayed to the user. Only valid for items that contain
520+submenus.
521+</para></refsect2>
522+<refsect2 id="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" role="macro">
523+<title>DBUSMENU_MENUITEM_EVENT_OPENED</title>
524+<indexterm zone="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_OPENED</primary></indexterm>
525+<programlisting>#define DBUSMENU_MENUITEM_EVENT_OPENED "opened"
526+</programlisting>
527+<para>
528+String for the event identifier when a menu is opened and
529+displayed to the user. Only valid for items that contain
530+submenus.
531+</para></refsect2>
532 <refsect2 id="DbusmenuMenuitem" role="struct">
533 <title>struct DbusmenuMenuitem</title>
534 <indexterm zone="DbusmenuMenuitem"><primary>DbusmenuMenuitem</primary></indexterm>
535
536=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
537--- docs/libdbusmenu-gtk/reference/html/ch01.html 2011-03-10 17:03:04 +0000
538+++ docs/libdbusmenu-gtk/reference/html/ch01.html 2011-03-23 20:03:35 +0000
539@@ -21,7 +21,7 @@
540 </tr></table>
541 <div class="chapter">
542 <div class="titlepage"><div><div><h2 class="title">
543-<a name="id581523"></a>API</h2></div></div></div>
544+<a name="id331770"></a>API</h2></div></div></div>
545 <div class="toc"><dl>
546 <dt>
547 <span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
548
549=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
550--- docs/libdbusmenu-gtk/reference/version.xml 2011-03-16 19:02:13 +0000
551+++ docs/libdbusmenu-gtk/reference/version.xml 2011-03-23 20:03:35 +0000
552@@ -1,1 +1,1 @@
553-0.3.102
554+0.4.0
555
556=== modified file 'libdbusmenu-glib/client.c'
557--- libdbusmenu-glib/client.c 2011-03-16 19:02:13 +0000
558+++ libdbusmenu-glib/client.c 2011-03-23 20:03:35 +0000
559@@ -599,9 +599,10 @@
560
561 /* Callback all the folks we can find */
562 GVariant * child = g_variant_get_child_value(params, 0);
563- GVariantIter * iter = g_variant_iter_new(child);
564+ GVariantIter iter;
565+ g_variant_iter_init(&iter, child);
566 g_variant_unref(child);
567- while ((child = g_variant_iter_next_value(iter)) != NULL) {
568+ while ((child = g_variant_iter_next_value(&iter)) != NULL) {
569 if (g_strcmp0(g_variant_get_type_string(child), "(ia{sv})") != 0) {
570 g_warning("Properties return signature is not '(ia{sv})' it is '%s'", g_variant_get_type_string(child));
571 g_variant_unref(child);
572@@ -631,7 +632,6 @@
573 g_variant_unref(properties);
574 g_variant_unref(child);
575 }
576- g_variant_iter_free(iter);
577 g_variant_unref(params);
578
579 /* Provide errors for those who we can't */
580@@ -1153,7 +1153,7 @@
581 GVariantIter iters;
582 gchar * key; GVariant * value;
583 g_variant_iter_init(&iters, properties);
584- while (g_variant_iter_next(&iters, "{sv}", &key, &value)) {
585+ while (g_variant_iter_loop(&iters, "{sv}", &key, &value)) {
586 if (g_strcmp0(key, "TextDirection") == 0) {
587 if (g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT)) {
588 GVariant * tmp = g_variant_get_variant(value);
589@@ -1181,9 +1181,6 @@
590 priv->icon_dirs = g_variant_dup_strv(value, NULL);
591 dirs_changed = TRUE;
592 }
593-
594- g_variant_unref(value);
595- g_free(key);
596 }
597
598 if (olddir != priv->text_direction) {
599@@ -1258,10 +1255,9 @@
600 g_variant_iter_init(&properties, propv);
601 gchar * property;
602
603- while (g_variant_iter_next(&properties, "s", &property)) {
604+ while (g_variant_iter_loop(&properties, "s", &property)) {
605 /* g_debug("Removing property '%s' on %d", property, id); */
606 dbusmenu_menuitem_property_remove(menuitem, property);
607- g_free(property);
608 }
609 g_variant_unref(ritem);
610 g_variant_unref(propv);
611@@ -1284,15 +1280,20 @@
612 gchar * property;
613 GVariant * value;
614
615- while (g_variant_iter_next(&properties, "{sv}", &property, &value)) {
616+ while (g_variant_iter_loop(&properties, "{sv}", &property, &value)) {
617 GVariant * internalvalue = value;
618 if (G_LIKELY(g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT))) {
619 /* Unboxing if needed */
620 internalvalue = g_variant_get_variant(value);
621- g_variant_unref(value);
622 }
623+
624 id_prop_update(proxy, id, property, internalvalue, client);
625- g_variant_unref(internalvalue);
626+
627+ if (internalvalue != value) {
628+ /* If we unboxed, we need to drop it, otherwise the
629+ iter_loop function will unref for us */
630+ g_variant_unref(internalvalue);
631+ }
632 }
633 g_variant_unref(propv);
634 g_variant_unref(item);
635@@ -1336,19 +1337,16 @@
636 return;
637 }
638
639- GVariantIter * iter = g_variant_iter_new(properties);
640+ GVariantIter iter;
641 gchar * key;
642 GVariant * value;
643
644- while (g_variant_iter_next(iter, "{sv}", &key, &value)) {
645+ g_variant_iter_init(&iter, properties);
646+
647+ while (g_variant_iter_loop(&iter, "{sv}", &key, &value)) {
648 dbusmenu_menuitem_property_set_variant(item, key, value);
649-
650- g_variant_unref(value);
651- g_free(key);
652 }
653
654- g_variant_iter_free(iter);
655-
656 g_object_unref(data);
657
658 return;
659@@ -1368,9 +1366,30 @@
660 have_error = TRUE;
661 }
662
663+ /* Get the list of the current properties */
664 GList * current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));
665 GList * tmp = NULL;
666
667+ if (properties != NULL) {
668+ GVariantIter iter;
669+ g_variant_iter_init(&iter, properties);
670+ gchar * name; GVariant * value;
671+
672+ /* Remove the entries from the current list that we have new
673+ values for. This way we don't create signals of them being
674+ removed with the duplication of the value being changed. */
675+ while (g_variant_iter_loop(&iter, "{sv}", &name, &value) && have_error == FALSE) {
676+ for (tmp = current_props; tmp != NULL; tmp = g_list_next(tmp)) {
677+ if (g_strcmp0((gchar *)tmp->data, name) == 0) {
678+ current_props = g_list_delete_link(current_props, tmp);
679+ break;
680+ }
681+ }
682+ }
683+ }
684+
685+ /* Remove all entries that we're not getting values for, we can
686+ assume that they no longer exist */
687 for (tmp = current_props; tmp != NULL && have_error == FALSE; tmp = g_list_next(tmp)) {
688 dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)tmp->data);
689 }
690@@ -1714,20 +1733,16 @@
691 all other properties. */
692 child_props = g_variant_get_child_value(child, 1);
693 g_variant_iter_init(&iter, child_props);
694- while (g_variant_iter_next(&iter, "{sv}", &prop, &value)) {
695+ while (g_variant_iter_loop(&iter, "{sv}", &prop, &value)) {
696 if (g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TYPE) == 0) {
697 dbusmenu_menuitem_property_set_variant(childmi, prop, value);
698 }
699- g_free(prop);
700- g_variant_unref(value);
701 }
702
703 /* Now go through and do all the properties. */
704 g_variant_iter_init(&iter, child_props);
705- while (g_variant_iter_next(&iter, "{sv}", &prop, &value)) {
706+ while (g_variant_iter_loop(&iter, "{sv}", &prop, &value)) {
707 dbusmenu_menuitem_property_set_variant(childmi, prop, value);
708- g_free(prop);
709- g_variant_unref(value);
710 }
711 g_variant_unref(child_props);
712 }
713
714=== modified file 'libdbusmenu-gtk/menuitem.c'
715--- libdbusmenu-gtk/menuitem.c 2011-03-10 00:43:07 +0000
716+++ libdbusmenu-gtk/menuitem.c 2011-03-23 20:03:35 +0000
717@@ -236,8 +236,15 @@
718 NULL);
719 }
720
721- if (closure == NULL)
722- return FALSE;
723+ if (closure == NULL) {
724+ /* As a fallback, check for a closure in the related menu item. This
725+ actually happens with SWT menu items. */
726+ GList * closures = gtk_widget_list_accel_closures (GTK_WIDGET (gmi));
727+ if (closures == NULL)
728+ return FALSE;
729+ closure = closures->data;
730+ g_list_free (closures);
731+ }
732
733 GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);
734
735
736=== modified file 'libdbusmenu-gtk/parser.c'
737--- libdbusmenu-gtk/parser.c 2011-03-16 19:02:13 +0000
738+++ libdbusmenu-gtk/parser.c 2011-03-23 20:03:35 +0000
739@@ -845,7 +845,9 @@
740
741 if (GTK_IS_MENU_ITEM (child))
742 {
743+ gdk_threads_enter ();
744 gtk_menu_item_activate (GTK_MENU_ITEM (child));
745+ gdk_threads_leave ();
746 }
747 }
748 }

Subscribers

People subscribed via source and target branches

to all changes: