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
=== modified file 'AUTHORS'
--- AUTHORS 2011-02-24 21:04:39 +0000
+++ AUTHORS 2011-03-23 20:03:35 +0000
@@ -12,6 +12,7 @@
12 Martin Pitt 12 Martin Pitt
13 Mathieu Trudel-Lapierre 13 Mathieu Trudel-Lapierre
14 Michael Terry 14 Michael Terry
15 Oleg Shparber
15 Robert Collins 16 Robert Collins
16 seb128 17 seb128
17 Sebastien Bacher 18 Sebastien Bacher
1819
=== modified file 'ChangeLog'
--- ChangeLog 2011-03-16 19:01:25 +0000
+++ ChangeLog 2011-03-23 20:03:35 +0000
@@ -1,5 +1,57 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-03-23 Ted Gould <ted@gould.cx>
4
5 0.4.0
6
72011-03-23 Ted Gould <ted@gould.cx>
8
9 Ensure that we don't remove properties that are getting their values updated
10
112011-03-22 Ted Gould <ted@gould.cx>
12
13 Protect against NULL properties
14
152011-03-22 Ted Gould <ted@gould.cx>
16
17 Remove the link instead of the data
18
192011-03-22 Ted Gould <ted@gould.cx>
20
21 Protect the entries that are about to be updated from being removed
22
232011-03-23 Ted Gould <ted@gould.cx>
24
25 Switch to using iter_loop to protect from NULL variants
26
272011-03-21 Ted Gould <ted@gould.cx>
28
29 A couple more intr_loops with a small memory leak fix
30
312011-03-21 Ted Gould <ted@gould.cx>
32
33 Moving from iter_next to iter_loop on a couple more iterators
34
352011-03-21 Ted Gould <ted@gould.cx>
36
37 Removing an unneeded iner_new
38
392011-03-21 Ted Gould <ted@gould.cx>
40
41 Use iter_loop to handle unref'ing the variants cleanly.
42
432011-03-22 Ted Gould <ted@gould.cx>
44
45 Look everywhere for accel closures
46
472011-03-21 Michael Terry <mike@mterry.name>
48
49 check menu items for accelerators directly if accel label doesn't have one
50
512011-03-21 Oleg Shparber <oleg.shparber@wisetroll.com>
52
53 Entering and exiting the GDK threads when calling up to GTK
54
32011-03-16 Ted Gould <ted@gould.cx>552011-03-16 Ted Gould <ted@gould.cx>
456
5 0.3.10257 0.3.102
658
=== modified file 'configure'
--- configure 2011-03-16 19:02:13 +0000
+++ configure 2011-03-23 20:03:35 +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.102.3# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.0.
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.102'706PACKAGE_VERSION='0.4.0'
707PACKAGE_STRING='libdbusmenu 0.3.102'707PACKAGE_STRING='libdbusmenu 0.4.0'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1541,7 +1541,7 @@
1541 # Omit some internal or obsolete options to make the list less imposing.1541 # Omit some internal or obsolete options to make the list less imposing.
1542 # This message is too long to be a string in the A/UX 3.1 sh.1542 # This message is too long to be a string in the A/UX 3.1 sh.
1543 cat <<_ACEOF1543 cat <<_ACEOF
1544\`configure' configures libdbusmenu 0.3.102 to adapt to many kinds of systems.1544\`configure' configures libdbusmenu 0.4.0 to adapt to many kinds of systems.
15451545
1546Usage: $0 [OPTION]... [VAR=VALUE]...1546Usage: $0 [OPTION]... [VAR=VALUE]...
15471547
@@ -1611,7 +1611,7 @@
16111611
1612if test -n "$ac_init_help"; then1612if test -n "$ac_init_help"; then
1613 case $ac_init_help in1613 case $ac_init_help in
1614 short | recursive ) echo "Configuration of libdbusmenu 0.3.102:";;1614 short | recursive ) echo "Configuration of libdbusmenu 0.4.0:";;
1615 esac1615 esac
1616 cat <<\_ACEOF1616 cat <<\_ACEOF
16171617
@@ -1751,7 +1751,7 @@
1751test -n "$ac_init_help" && exit $ac_status1751test -n "$ac_init_help" && exit $ac_status
1752if $ac_init_version; then1752if $ac_init_version; then
1753 cat <<\_ACEOF1753 cat <<\_ACEOF
1754libdbusmenu configure 0.3.1021754libdbusmenu configure 0.4.0
1755generated by GNU Autoconf 2.671755generated by GNU Autoconf 2.67
17561756
1757Copyright (C) 2010 Free Software Foundation, Inc.1757Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2122,7 +2122,7 @@
2122This file contains any messages produced by compilers while2122This file contains any messages produced by compilers while
2123running configure, to aid debugging if configure makes a mistake.2123running configure, to aid debugging if configure makes a mistake.
21242124
2125It was created by libdbusmenu $as_me 0.3.102, which was2125It was created by libdbusmenu $as_me 0.4.0, which was
2126generated by GNU Autoconf 2.67. Invocation command line was2126generated by GNU Autoconf 2.67. Invocation command line was
21272127
2128 $ $0 $@2128 $ $0 $@
@@ -2943,7 +2943,7 @@
29432943
2944# Define the identity of the package.2944# Define the identity of the package.
2945 PACKAGE=libdbusmenu2945 PACKAGE=libdbusmenu
2946 VERSION=0.3.1022946 VERSION=0.4.0
29472947
29482948
2949# Some tools Automake needs.2949# Some tools Automake needs.
@@ -13294,7 +13294,7 @@
13294###########################13294###########################
1329513295
13296LIBDBUSMENU_CURRENT=313296LIBDBUSMENU_CURRENT=3
13297LIBDBUSMENU_REVISION=1013297LIBDBUSMENU_REVISION=11
13298LIBDBUSMENU_AGE=013298LIBDBUSMENU_AGE=0
1329913299
1330013300
@@ -14616,7 +14616,7 @@
14616# report actual input values of CONFIG_FILES etc. instead of their14616# report actual input values of CONFIG_FILES etc. instead of their
14617# values after options handling.14617# values after options handling.
14618ac_log="14618ac_log="
14619This file was extended by libdbusmenu $as_me 0.3.102, which was14619This file was extended by libdbusmenu $as_me 0.4.0, which was
14620generated by GNU Autoconf 2.67. Invocation command line was14620generated by GNU Autoconf 2.67. Invocation command line was
1462114621
14622 CONFIG_FILES = $CONFIG_FILES14622 CONFIG_FILES = $CONFIG_FILES
@@ -14682,7 +14682,7 @@
14682cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114682cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14683ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14683ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14684ac_cs_version="\\14684ac_cs_version="\\
14685libdbusmenu config.status 0.3.10214685libdbusmenu config.status 0.4.0
14686configured by $0, generated by GNU Autoconf 2.67,14686configured by $0, generated by GNU Autoconf 2.67,
14687 with options \\"\$ac_cs_config\\"14687 with options \\"\$ac_cs_config\\"
1468814688
1468914689
=== modified file 'configure.ac'
--- configure.ac 2011-03-16 19:02:13 +0000
+++ configure.ac 2011-03-23 20:03:35 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.102, ted@canonical.com)2AC_INIT(libdbusmenu, 0.4.0, 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.102, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.4.0, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -134,7 +134,7 @@
134###########################134###########################
135135
136LIBDBUSMENU_CURRENT=3136LIBDBUSMENU_CURRENT=3
137LIBDBUSMENU_REVISION=10137LIBDBUSMENU_REVISION=11
138LIBDBUSMENU_AGE=0138LIBDBUSMENU_AGE=0
139139
140AC_SUBST(LIBDBUSMENU_CURRENT)140AC_SUBST(LIBDBUSMENU_CURRENT)
141141
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-16 19:53:11 +0000
+++ debian/changelog 2011-03-23 20:03:35 +0000
@@ -1,3 +1,14 @@
1libdbusmenu (0.4.0-0ubuntu1~ppa1) natty; urgency=low
2
3 * New upstream release.
4 * Protect from NULL variants by using iter_loop (LP: #737844)
5 * Look for accellerators inside the labels as well
6 * Protecting properties that are getting updated from an
7 extra remove signal. (LP: #730925)
8 * Enter and exit the GDK threads before calling GTK (LP: #717162)
9
10 -- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 14:56:24 -0500
11
1libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low12libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low
213
3 * New upstream release.14 * New upstream release.
415
=== modified file 'docs/libdbusmenu-glib/reference/html/api-index-full.html'
--- docs/libdbusmenu-glib/reference/html/api-index-full.html 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/api-index-full.html 2011-03-23 20:03:35 +0000
@@ -180,6 +180,18 @@
180</dt>180</dt>
181<dd></dd>181<dd></dd>
182<dt>182<dt>
183<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>
184</dt>
185<dd></dd>
186<dt>
187<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>
188</dt>
189<dd></dd>
190<dt>
191<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>
192</dt>
193<dd></dd>
194<dt>
183<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>195<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>
184</dt>196</dt>
185<dd></dd>197<dd></dd>
186198
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html 2011-03-23 20:03:35 +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="id325831"></a>API</h2></div></div></div>24<a name="id440860"></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"> — The server signals changed and27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
2828
=== modified file 'docs/libdbusmenu-glib/reference/html/index.sgml'
--- docs/libdbusmenu-glib/reference/html/index.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/index.sgml 2011-03-23 20:03:35 +0000
@@ -66,6 +66,9 @@
66<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">66<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">
67<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">67<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">
68<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">68<ANCHOR id="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">
69<ANCHOR id="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS">
70<ANCHOR id="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS">
71<ANCHOR id="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS">
69<ANCHOR id="DbusmenuMenuitem" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem">72<ANCHOR id="DbusmenuMenuitem" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem">
70<ANCHOR id="dbusmenu-menuitem-about-to-show-cb" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb">73<ANCHOR id="dbusmenu-menuitem-about-to-show-cb" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb">
71<ANCHOR id="dbusmenu-menuitem-buildvariant-slot-t" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t">74<ANCHOR id="dbusmenu-menuitem-buildvariant-slot-t" href="libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t">
7275
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2011-03-23 20:03:35 +0000
@@ -75,6 +75,9 @@
75#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_CONTROL">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</a>75#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_CONTROL">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</a>
76#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SHIFT">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</a>76#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SHIFT">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</a>
77#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SUPER">DBUSMENU_MENUITEM_SHORTCUT_SUPER</a>77#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS" title="DBUSMENU_MENUITEM_SHORTCUT_SUPER">DBUSMENU_MENUITEM_SHORTCUT_SUPER</a>
78#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" title="DBUSMENU_MENUITEM_EVENT_ACTIVATED">DBUSMENU_MENUITEM_EVENT_ACTIVATED</a>
79#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" title="DBUSMENU_MENUITEM_EVENT_CLOSED">DBUSMENU_MENUITEM_EVENT_CLOSED</a>
80#define <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" title="DBUSMENU_MENUITEM_EVENT_OPENED">DBUSMENU_MENUITEM_EVENT_OPENED</a>
78struct <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem">DbusmenuMenuitem</a>;81struct <a class="link" href="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem" title="struct DbusmenuMenuitem">DbusmenuMenuitem</a>;
79<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>)82<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>)
80 (<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>,83 (<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>,
@@ -493,6 +496,38 @@
493</div>496</div>
494<hr>497<hr>
495<div class="refsect2">498<div class="refsect2">
499<a name="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_ACTIVATED</h3>
500<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked"
501</pre>
502<p>
503String for the event identifier when a menu item is clicked
504on by the user.
505</p>
506</div>
507<hr>
508<div class="refsect2">
509<a name="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_CLOSED</h3>
510<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_CLOSED "closed"
511</pre>
512<p>
513String for the event identifier when a menu is closed and
514displayed to the user. Only valid for items that contain
515submenus.
516</p>
517</div>
518<hr>
519<div class="refsect2">
520<a name="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"></a><h3>DBUSMENU_MENUITEM_EVENT_OPENED</h3>
521<pre class="programlisting">#define DBUSMENU_MENUITEM_EVENT_OPENED "opened"
522</pre>
523<p>
524String for the event identifier when a menu is opened and
525displayed to the user. Only valid for items that contain
526submenus.
527</p>
528</div>
529<hr>
530<div class="refsect2">
496<a name="DbusmenuMenuitem"></a><h3>struct DbusmenuMenuitem</h3>531<a name="DbusmenuMenuitem"></a><h3>struct DbusmenuMenuitem</h3>
497<pre class="programlisting">struct DbusmenuMenuitem {532<pre class="programlisting">struct DbusmenuMenuitem {
498 GObject parent;533 GObject parent;
499534
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp 2011-03-23 20:03:35 +0000
@@ -68,6 +68,9 @@
68 <function name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>68 <function name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>
69 <function name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>69 <function name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>
70 <function name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>70 <function name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>
71 <function name="DBUSMENU_MENUITEM_EVENT_ACTIVATED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"/>
72 <function name="DBUSMENU_MENUITEM_EVENT_CLOSED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"/>
73 <function name="DBUSMENU_MENUITEM_EVENT_OPENED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"/>
71 <function name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>74 <function name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>
72 <function name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>75 <function name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
73 <function name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>76 <function name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>
7477
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 2011-03-23 20:03:35 +0000
@@ -68,6 +68,9 @@
68 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>68 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_CONTROL" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS"/>
69 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>69 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SHIFT" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS"/>
70 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>70 <keyword type="macro" name="DBUSMENU_MENUITEM_SHORTCUT_SUPER" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS"/>
71 <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_ACTIVATED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"/>
72 <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_CLOSED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"/>
73 <keyword type="macro" name="DBUSMENU_MENUITEM_EVENT_OPENED" link="libdbusmenu-glib-DbusmenuMenuitem.html#DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"/>
71 <keyword type="struct" name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>74 <keyword type="struct" name="struct DbusmenuMenuitem" link="libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"/>
72 <keyword type="function" name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>75 <keyword type="function" name="dbusmenu_menuitem_about_to_show_cb ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-about-to-show-cb"/>
73 <keyword type="function" name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>76 <keyword type="function" name="dbusmenu_menuitem_buildvariant_slot_t ()" link="libdbusmenu-glib-DbusmenuMenuitem.html#dbusmenu-menuitem-buildvariant-slot-t"/>
7477
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/client.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/client.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/client.sgml 2011-03-23 20:03:35 +0000
@@ -9,13 +9,11 @@
99
10</para>10</para>
1111
12
13<!-- ##### SECTION See_Also ##### -->12<!-- ##### SECTION See_Also ##### -->
14<para>13<para>
1514
16</para>15</para>
1716
18
19<!-- ##### SECTION Stability_Level ##### -->17<!-- ##### SECTION Stability_Level ##### -->
2018
2119
2220
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2011-03-23 20:03:35 +0000
@@ -9,13 +9,11 @@
99
10</para>10</para>
1111
12
13<!-- ##### SECTION See_Also ##### -->12<!-- ##### SECTION See_Also ##### -->
14<para>13<para>
1514
16</para>15</para>
1716
18
19<!-- ##### SECTION Stability_Level ##### -->17<!-- ##### SECTION Stability_Level ##### -->
2018
2119
2220
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2011-03-23 20:03:35 +0000
@@ -9,13 +9,11 @@
99
10</para>10</para>
1111
12
13<!-- ##### SECTION See_Also ##### -->12<!-- ##### SECTION See_Also ##### -->
14<para>13<para>
1514
16</para>15</para>
1716
18
19<!-- ##### SECTION Stability_Level ##### -->17<!-- ##### SECTION Stability_Level ##### -->
2018
2119
@@ -239,6 +237,27 @@
239237
240238
241239
240<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_ACTIVATED ##### -->
241<para>
242
243</para>
244
245
246
247<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_CLOSED ##### -->
248<para>
249
250</para>
251
252
253
254<!-- ##### MACRO DBUSMENU_MENUITEM_EVENT_OPENED ##### -->
255<para>
256
257</para>
258
259
260
242<!-- ##### STRUCT DbusmenuMenuitem ##### -->261<!-- ##### STRUCT DbusmenuMenuitem ##### -->
243<para>262<para>
244263
245264
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/server.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/server.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/server.sgml 2011-03-23 20:03:35 +0000
@@ -9,13 +9,11 @@
99
10</para>10</para>
1111
12
13<!-- ##### SECTION See_Also ##### -->12<!-- ##### SECTION See_Also ##### -->
14<para>13<para>
1514
16</para>15</para>
1716
18
19<!-- ##### SECTION Stability_Level ##### -->17<!-- ##### SECTION Stability_Level ##### -->
2018
2119
2220
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/types.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/types.sgml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/types.sgml 2011-03-23 20:03:35 +0000
@@ -9,13 +9,11 @@
99
10</para>10</para>
1111
12
13<!-- ##### SECTION See_Also ##### -->12<!-- ##### SECTION See_Also ##### -->
14<para>13<para>
1514
16</para>15</para>
1716
18
19<!-- ##### SECTION Stability_Level ##### -->17<!-- ##### SECTION Stability_Level ##### -->
2018
2119
2220
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2011-03-16 19:02:13 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2011-03-23 20:03:35 +0000
@@ -1,1 +1,1 @@
10.3.10210.4.0
22
=== modified file 'docs/libdbusmenu-glib/reference/xml/api-index-full.xml'
--- docs/libdbusmenu-glib/reference/xml/api-index-full.xml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/xml/api-index-full.xml 2011-03-23 20:03:35 +0000
@@ -44,6 +44,9 @@
44<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>44<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>
45<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>45<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>
46<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>46<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>
47<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>
48<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>
49<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>
47<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>50<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>
48<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>51<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>
49<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>52<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>
5053
=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
--- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2011-03-23 20:03:35 +0000
@@ -58,6 +58,9 @@
58#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</link>58#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-CONTROL:CAPS">DBUSMENU_MENUITEM_SHORTCUT_CONTROL</link>
59#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</link>59#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SHIFT:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SHIFT</link>
60#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SUPER</link>60#define <link linkend="DBUSMENU-MENUITEM-SHORTCUT-SUPER:CAPS">DBUSMENU_MENUITEM_SHORTCUT_SUPER</link>
61#define <link linkend="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS">DBUSMENU_MENUITEM_EVENT_ACTIVATED</link>
62#define <link linkend="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS">DBUSMENU_MENUITEM_EVENT_CLOSED</link>
63#define <link linkend="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS">DBUSMENU_MENUITEM_EVENT_OPENED</link>
61struct <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>;64struct <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>;
62<link linkend="void"><returnvalue>void</returnvalue></link> (<link linkend="dbusmenu-menuitem-about-to-show-cb">*dbusmenu_menuitem_about_to_show_cb</link>)65<link linkend="void"><returnvalue>void</returnvalue></link> (<link linkend="dbusmenu-menuitem-about-to-show-cb">*dbusmenu_menuitem_about_to_show_cb</link>)
63 (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,66 (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
@@ -445,6 +448,35 @@
445Used in <link linkend="DBUSMENU-MENUITEM-PROP-SHORTCUT:CAPS"><type>DBUSMENU_MENUITEM_PROP_SHORTCUT</type></link> to represent the448Used in <link linkend="DBUSMENU-MENUITEM-PROP-SHORTCUT:CAPS"><type>DBUSMENU_MENUITEM_PROP_SHORTCUT</type></link> to represent the
446super key.449super key.
447</para></refsect2>450</para></refsect2>
451<refsect2 id="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS" role="macro">
452<title>DBUSMENU_MENUITEM_EVENT_ACTIVATED</title>
453<indexterm zone="DBUSMENU-MENUITEM-EVENT-ACTIVATED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_ACTIVATED</primary></indexterm>
454<programlisting>#define DBUSMENU_MENUITEM_EVENT_ACTIVATED "clicked"
455</programlisting>
456<para>
457String for the event identifier when a menu item is clicked
458on by the user.
459</para></refsect2>
460<refsect2 id="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS" role="macro">
461<title>DBUSMENU_MENUITEM_EVENT_CLOSED</title>
462<indexterm zone="DBUSMENU-MENUITEM-EVENT-CLOSED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_CLOSED</primary></indexterm>
463<programlisting>#define DBUSMENU_MENUITEM_EVENT_CLOSED "closed"
464</programlisting>
465<para>
466String for the event identifier when a menu is closed and
467displayed to the user. Only valid for items that contain
468submenus.
469</para></refsect2>
470<refsect2 id="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS" role="macro">
471<title>DBUSMENU_MENUITEM_EVENT_OPENED</title>
472<indexterm zone="DBUSMENU-MENUITEM-EVENT-OPENED:CAPS"><primary>DBUSMENU_MENUITEM_EVENT_OPENED</primary></indexterm>
473<programlisting>#define DBUSMENU_MENUITEM_EVENT_OPENED "opened"
474</programlisting>
475<para>
476String for the event identifier when a menu is opened and
477displayed to the user. Only valid for items that contain
478submenus.
479</para></refsect2>
448<refsect2 id="DbusmenuMenuitem" role="struct">480<refsect2 id="DbusmenuMenuitem" role="struct">
449<title>struct DbusmenuMenuitem</title>481<title>struct DbusmenuMenuitem</title>
450<indexterm zone="DbusmenuMenuitem"><primary>DbusmenuMenuitem</primary></indexterm>482<indexterm zone="DbusmenuMenuitem"><primary>DbusmenuMenuitem</primary></indexterm>
451483
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html 2011-03-10 17:03:04 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html 2011-03-23 20:03:35 +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="id581523"></a>API</h2></div></div></div>24<a name="id331770"></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-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>27<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
2828
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2011-03-16 19:02:13 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2011-03-23 20:03:35 +0000
@@ -1,1 +1,1 @@
10.3.10210.4.0
22
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2011-03-16 19:02:13 +0000
+++ libdbusmenu-glib/client.c 2011-03-23 20:03:35 +0000
@@ -599,9 +599,10 @@
599599
600 /* Callback all the folks we can find */600 /* Callback all the folks we can find */
601 GVariant * child = g_variant_get_child_value(params, 0);601 GVariant * child = g_variant_get_child_value(params, 0);
602 GVariantIter * iter = g_variant_iter_new(child);602 GVariantIter iter;
603 g_variant_iter_init(&iter, child);
603 g_variant_unref(child);604 g_variant_unref(child);
604 while ((child = g_variant_iter_next_value(iter)) != NULL) {605 while ((child = g_variant_iter_next_value(&iter)) != NULL) {
605 if (g_strcmp0(g_variant_get_type_string(child), "(ia{sv})") != 0) {606 if (g_strcmp0(g_variant_get_type_string(child), "(ia{sv})") != 0) {
606 g_warning("Properties return signature is not '(ia{sv})' it is '%s'", g_variant_get_type_string(child));607 g_warning("Properties return signature is not '(ia{sv})' it is '%s'", g_variant_get_type_string(child));
607 g_variant_unref(child);608 g_variant_unref(child);
@@ -631,7 +632,6 @@
631 g_variant_unref(properties);632 g_variant_unref(properties);
632 g_variant_unref(child);633 g_variant_unref(child);
633 }634 }
634 g_variant_iter_free(iter);
635 g_variant_unref(params);635 g_variant_unref(params);
636636
637 /* Provide errors for those who we can't */637 /* Provide errors for those who we can't */
@@ -1153,7 +1153,7 @@
1153 GVariantIter iters;1153 GVariantIter iters;
1154 gchar * key; GVariant * value;1154 gchar * key; GVariant * value;
1155 g_variant_iter_init(&iters, properties);1155 g_variant_iter_init(&iters, properties);
1156 while (g_variant_iter_next(&iters, "{sv}", &key, &value)) {1156 while (g_variant_iter_loop(&iters, "{sv}", &key, &value)) {
1157 if (g_strcmp0(key, "TextDirection") == 0) {1157 if (g_strcmp0(key, "TextDirection") == 0) {
1158 if (g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT)) {1158 if (g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT)) {
1159 GVariant * tmp = g_variant_get_variant(value);1159 GVariant * tmp = g_variant_get_variant(value);
@@ -1181,9 +1181,6 @@
1181 priv->icon_dirs = g_variant_dup_strv(value, NULL);1181 priv->icon_dirs = g_variant_dup_strv(value, NULL);
1182 dirs_changed = TRUE;1182 dirs_changed = TRUE;
1183 }1183 }
1184
1185 g_variant_unref(value);
1186 g_free(key);
1187 }1184 }
11881185
1189 if (olddir != priv->text_direction) {1186 if (olddir != priv->text_direction) {
@@ -1258,10 +1255,9 @@
1258 g_variant_iter_init(&properties, propv);1255 g_variant_iter_init(&properties, propv);
1259 gchar * property;1256 gchar * property;
12601257
1261 while (g_variant_iter_next(&properties, "s", &property)) {1258 while (g_variant_iter_loop(&properties, "s", &property)) {
1262 /* g_debug("Removing property '%s' on %d", property, id); */1259 /* g_debug("Removing property '%s' on %d", property, id); */
1263 dbusmenu_menuitem_property_remove(menuitem, property);1260 dbusmenu_menuitem_property_remove(menuitem, property);
1264 g_free(property);
1265 }1261 }
1266 g_variant_unref(ritem);1262 g_variant_unref(ritem);
1267 g_variant_unref(propv);1263 g_variant_unref(propv);
@@ -1284,15 +1280,20 @@
1284 gchar * property;1280 gchar * property;
1285 GVariant * value;1281 GVariant * value;
12861282
1287 while (g_variant_iter_next(&properties, "{sv}", &property, &value)) {1283 while (g_variant_iter_loop(&properties, "{sv}", &property, &value)) {
1288 GVariant * internalvalue = value;1284 GVariant * internalvalue = value;
1289 if (G_LIKELY(g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT))) {1285 if (G_LIKELY(g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT))) {
1290 /* Unboxing if needed */1286 /* Unboxing if needed */
1291 internalvalue = g_variant_get_variant(value);1287 internalvalue = g_variant_get_variant(value);
1292 g_variant_unref(value);
1293 }1288 }
1289
1294 id_prop_update(proxy, id, property, internalvalue, client);1290 id_prop_update(proxy, id, property, internalvalue, client);
1295 g_variant_unref(internalvalue);1291
1292 if (internalvalue != value) {
1293 /* If we unboxed, we need to drop it, otherwise the
1294 iter_loop function will unref for us */
1295 g_variant_unref(internalvalue);
1296 }
1296 }1297 }
1297 g_variant_unref(propv);1298 g_variant_unref(propv);
1298 g_variant_unref(item);1299 g_variant_unref(item);
@@ -1336,19 +1337,16 @@
1336 return;1337 return;
1337 }1338 }
13381339
1339 GVariantIter * iter = g_variant_iter_new(properties);1340 GVariantIter iter;
1340 gchar * key;1341 gchar * key;
1341 GVariant * value;1342 GVariant * value;
13421343
1343 while (g_variant_iter_next(iter, "{sv}", &key, &value)) {1344 g_variant_iter_init(&iter, properties);
1345
1346 while (g_variant_iter_loop(&iter, "{sv}", &key, &value)) {
1344 dbusmenu_menuitem_property_set_variant(item, key, value);1347 dbusmenu_menuitem_property_set_variant(item, key, value);
1345
1346 g_variant_unref(value);
1347 g_free(key);
1348 }1348 }
13491349
1350 g_variant_iter_free(iter);
1351
1352 g_object_unref(data);1350 g_object_unref(data);
13531351
1354 return;1352 return;
@@ -1368,9 +1366,30 @@
1368 have_error = TRUE;1366 have_error = TRUE;
1369 }1367 }
13701368
1369 /* Get the list of the current properties */
1371 GList * current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));1370 GList * current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));
1372 GList * tmp = NULL;1371 GList * tmp = NULL;
13731372
1373 if (properties != NULL) {
1374 GVariantIter iter;
1375 g_variant_iter_init(&iter, properties);
1376 gchar * name; GVariant * value;
1377
1378 /* Remove the entries from the current list that we have new
1379 values for. This way we don't create signals of them being
1380 removed with the duplication of the value being changed. */
1381 while (g_variant_iter_loop(&iter, "{sv}", &name, &value) && have_error == FALSE) {
1382 for (tmp = current_props; tmp != NULL; tmp = g_list_next(tmp)) {
1383 if (g_strcmp0((gchar *)tmp->data, name) == 0) {
1384 current_props = g_list_delete_link(current_props, tmp);
1385 break;
1386 }
1387 }
1388 }
1389 }
1390
1391 /* Remove all entries that we're not getting values for, we can
1392 assume that they no longer exist */
1374 for (tmp = current_props; tmp != NULL && have_error == FALSE; tmp = g_list_next(tmp)) {1393 for (tmp = current_props; tmp != NULL && have_error == FALSE; tmp = g_list_next(tmp)) {
1375 dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)tmp->data);1394 dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)tmp->data);
1376 }1395 }
@@ -1714,20 +1733,16 @@
1714 all other properties. */1733 all other properties. */
1715 child_props = g_variant_get_child_value(child, 1);1734 child_props = g_variant_get_child_value(child, 1);
1716 g_variant_iter_init(&iter, child_props);1735 g_variant_iter_init(&iter, child_props);
1717 while (g_variant_iter_next(&iter, "{sv}", &prop, &value)) {1736 while (g_variant_iter_loop(&iter, "{sv}", &prop, &value)) {
1718 if (g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TYPE) == 0) {1737 if (g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TYPE) == 0) {
1719 dbusmenu_menuitem_property_set_variant(childmi, prop, value);1738 dbusmenu_menuitem_property_set_variant(childmi, prop, value);
1720 }1739 }
1721 g_free(prop);
1722 g_variant_unref(value);
1723 }1740 }
17241741
1725 /* Now go through and do all the properties. */1742 /* Now go through and do all the properties. */
1726 g_variant_iter_init(&iter, child_props);1743 g_variant_iter_init(&iter, child_props);
1727 while (g_variant_iter_next(&iter, "{sv}", &prop, &value)) {1744 while (g_variant_iter_loop(&iter, "{sv}", &prop, &value)) {
1728 dbusmenu_menuitem_property_set_variant(childmi, prop, value);1745 dbusmenu_menuitem_property_set_variant(childmi, prop, value);
1729 g_free(prop);
1730 g_variant_unref(value);
1731 }1746 }
1732 g_variant_unref(child_props);1747 g_variant_unref(child_props);
1733 }1748 }
17341749
=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c 2011-03-10 00:43:07 +0000
+++ libdbusmenu-gtk/menuitem.c 2011-03-23 20:03:35 +0000
@@ -236,8 +236,15 @@
236 NULL);236 NULL);
237 }237 }
238238
239 if (closure == NULL)239 if (closure == NULL) {
240 return FALSE;240 /* As a fallback, check for a closure in the related menu item. This
241 actually happens with SWT menu items. */
242 GList * closures = gtk_widget_list_accel_closures (GTK_WIDGET (gmi));
243 if (closures == NULL)
244 return FALSE;
245 closure = closures->data;
246 g_list_free (closures);
247 }
241248
242 GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);249 GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);
243250
244251
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2011-03-16 19:02:13 +0000
+++ libdbusmenu-gtk/parser.c 2011-03-23 20:03:35 +0000
@@ -845,7 +845,9 @@
845845
846 if (GTK_IS_MENU_ITEM (child))846 if (GTK_IS_MENU_ITEM (child))
847 {847 {
848 gdk_threads_enter ();
848 gtk_menu_item_activate (GTK_MENU_ITEM (child));849 gtk_menu_item_activate (GTK_MENU_ITEM (child));
850 gdk_threads_leave ();
849 }851 }
850 }852 }
851}853}

Subscribers

People subscribed via source and target branches

to all changes: