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

Proposed by Ted Gould
Status: Merged
Merged at revision: 82
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 6233 lines (+5104/-241)
37 files modified
configure (+32/-21)
configure.ac (+7/-4)
debian/changelog (+11/-0)
debian/control (+29/-0)
debian/libdbusmenu-jsonloader-dev.install (+4/-0)
debian/libdbusmenu-jsonloader1.install (+1/-0)
docs/libdbusmenu-glib/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html (+1/-0)
docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html (+1/-1)
docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml (+0/-2)
docs/libdbusmenu-glib/reference/tmpl/client.sgml (+1/-2)
docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml (+0/-2)
docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml (+1/-2)
docs/libdbusmenu-glib/reference/tmpl/server.sgml (+0/-2)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-glib/reference/xml/client.xml (+1/-0)
docs/libdbusmenu-glib/reference/xml/menuitem.xml (+1/-1)
docs/libdbusmenu-gtk/reference/html/ch01.html (+1/-1)
docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html (+18/-18)
docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html (+3/-3)
docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html (+6/-6)
docs/libdbusmenu-gtk/reference/tmpl/client.sgml (+0/-2)
docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml (+0/-2)
docs/libdbusmenu-gtk/reference/tmpl/menu.sgml (+0/-2)
docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml (+0/-2)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-gtk/client.c (+1/-0)
tests/Makefile.am (+89/-4)
tests/Makefile.in (+341/-87)
tests/dbusmenu-jsonloader.pc.in (+14/-0)
tests/json-loader.c (+220/-0)
tests/json-loader.h (+31/-0)
tests/test-gtk-label-server.c (+2/-69)
tests/test-json-01.json (+4023/-0)
tests/test-json-client.c (+75/-0)
tests/test-json-server.c (+81/-0)
tools/dbusmenu-dumper.c (+106/-5)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+28996@code.launchpad.net

Description of the change

0.3.4

To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
82. By Sebastien Bacher

releasing version 0.3.4-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure'
--- configure 2010-06-24 14:27:00 +0000
+++ configure 2010-07-01 14:04:28 +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.65 for libdbusmenu 0.3.3.3# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.4.
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.3'706PACKAGE_VERSION='0.3.4'
707PACKAGE_STRING='libdbusmenu 0.3.3'707PACKAGE_STRING='libdbusmenu 0.3.4'
708PACKAGE_BUGREPORT='ted@canonical.com'708PACKAGE_BUGREPORT='ted@canonical.com'
709PACKAGE_URL=''709PACKAGE_URL=''
710710
@@ -1524,7 +1524,7 @@
1524 # Omit some internal or obsolete options to make the list less imposing.1524 # Omit some internal or obsolete options to make the list less imposing.
1525 # This message is too long to be a string in the A/UX 3.1 sh.1525 # This message is too long to be a string in the A/UX 3.1 sh.
1526 cat <<_ACEOF1526 cat <<_ACEOF
1527\`configure' configures libdbusmenu 0.3.3 to adapt to many kinds of systems.1527\`configure' configures libdbusmenu 0.3.4 to adapt to many kinds of systems.
15281528
1529Usage: $0 [OPTION]... [VAR=VALUE]...1529Usage: $0 [OPTION]... [VAR=VALUE]...
15301530
@@ -1594,7 +1594,7 @@
15941594
1595if test -n "$ac_init_help"; then1595if test -n "$ac_init_help"; then
1596 case $ac_init_help in1596 case $ac_init_help in
1597 short | recursive ) echo "Configuration of libdbusmenu 0.3.3:";;1597 short | recursive ) echo "Configuration of libdbusmenu 0.3.4:";;
1598 esac1598 esac
1599 cat <<\_ACEOF1599 cat <<\_ACEOF
16001600
@@ -1724,7 +1724,7 @@
1724test -n "$ac_init_help" && exit $ac_status1724test -n "$ac_init_help" && exit $ac_status
1725if $ac_init_version; then1725if $ac_init_version; then
1726 cat <<\_ACEOF1726 cat <<\_ACEOF
1727libdbusmenu configure 0.3.31727libdbusmenu configure 0.3.4
1728generated by GNU Autoconf 2.651728generated by GNU Autoconf 2.65
17291729
1730Copyright (C) 2009 Free Software Foundation, Inc.1730Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2097,7 +2097,7 @@
2097This file contains any messages produced by compilers while2097This file contains any messages produced by compilers while
2098running configure, to aid debugging if configure makes a mistake.2098running configure, to aid debugging if configure makes a mistake.
20992099
2100It was created by libdbusmenu $as_me 0.3.3, which was2100It was created by libdbusmenu $as_me 0.3.4, which was
2101generated by GNU Autoconf 2.65. Invocation command line was2101generated by GNU Autoconf 2.65. Invocation command line was
21022102
2103 $ $0 $@2103 $ $0 $@
@@ -2911,7 +2911,7 @@
29112911
2912# Define the identity of the package.2912# Define the identity of the package.
2913 PACKAGE=libdbusmenu2913 PACKAGE=libdbusmenu
2914 VERSION=0.3.32914 VERSION=0.3.4
29152915
29162916
2917# Some tools Automake needs.2917# Some tools Automake needs.
@@ -12684,6 +12684,7 @@
12684###########################12684###########################
1268512685
12686JSON_GLIB_REQUIRED_VERSION=0.6.012686JSON_GLIB_REQUIRED_VERSION=0.6.0
12687GIO_UNIX_REQUIRED_VERSION=2.24
1268712688
1268812689
12689pkg_failed=no12690pkg_failed=no
@@ -12695,12 +12696,15 @@
12695 pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS"12696 pkg_cv_DBUSMENUTESTS_CFLAGS="$DBUSMENUTESTS_CFLAGS"
12696 else12697 else
12697 if test -n "$PKG_CONFIG" && \12698 if test -n "$PKG_CONFIG" && \
12698 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&512699 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
12699 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&512700 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
12701 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12702 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
12700 ac_status=$?12703 ac_status=$?
12701 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&512704 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12702 test $ac_status = 0; }; then12705 test $ac_status = 0; }; then
12703 pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null`12706 pkg_cv_DBUSMENUTESTS_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12707 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
12704else12708else
12705 pkg_failed=yes12709 pkg_failed=yes
12706fi12710fi
@@ -12713,12 +12717,15 @@
12713 pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS"12717 pkg_cv_DBUSMENUTESTS_LIBS="$DBUSMENUTESTS_LIBS"
12714 else12718 else
12715 if test -n "$PKG_CONFIG" && \12719 if test -n "$PKG_CONFIG" && \
12716 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION\""; } >&512720 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
12717 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION") 2>&512721 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5
12722 ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12723 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5
12718 ac_status=$?12724 ac_status=$?
12719 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&512725 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12720 test $ac_status = 0; }; then12726 test $ac_status = 0; }; then
12721 pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION" 2>/dev/null`12727 pkg_cv_DBUSMENUTESTS_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12728 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null`
12722else12729else
12723 pkg_failed=yes12730 pkg_failed=yes
12724fi12731fi
@@ -12737,14 +12744,17 @@
12737 _pkg_short_errors_supported=no12744 _pkg_short_errors_supported=no
12738fi12745fi
12739 if test $_pkg_short_errors_supported = yes; then12746 if test $_pkg_short_errors_supported = yes; then
12740 DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"`12747 DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12748 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"`
12741 else12749 else
12742 DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION"`12750 DBUSMENUTESTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12751 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION"`
12743 fi12752 fi
12744 # Put the nasty error message in config.log where it belongs12753 # Put the nasty error message in config.log where it belongs
12745 echo "$DBUSMENUTESTS_PKG_ERRORS" >&512754 echo "$DBUSMENUTESTS_PKG_ERRORS" >&5
1274612755
12747 as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) were not met:12756 as_fn_error "Package requirements (json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
12757 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met:
1274812758
12749$DBUSMENUTESTS_PKG_ERRORS12759$DBUSMENUTESTS_PKG_ERRORS
1275012760
@@ -12927,7 +12937,7 @@
12927###########################12937###########################
1292812938
12929LIBDBUSMENU_CURRENT=112939LIBDBUSMENU_CURRENT=1
12930LIBDBUSMENU_REVISION=812940LIBDBUSMENU_REVISION=9
12931LIBDBUSMENU_AGE=012941LIBDBUSMENU_AGE=0
1293212942
1293312943
@@ -13673,7 +13683,7 @@
13673# Files13683# Files
13674###########################13684###########################
1367513685
13676ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"13686ac_config_files="$ac_config_files Makefile po/Makefile.in libdbusmenu-glib/Makefile libdbusmenu-glib/dbusmenu-glib.pc libdbusmenu-gtk/Makefile libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile docs/libdbusmenu-glib/reference/version.xml docs/libdbusmenu-gtk/Makefile docs/libdbusmenu-gtk/reference/Makefile docs/libdbusmenu-gtk/reference/version.xml"
1367713687
13678cat >confcache <<\_ACEOF13688cat >confcache <<\_ACEOF
13679# This file is a shell script that caches the results of configure13689# This file is a shell script that caches the results of configure
@@ -14240,7 +14250,7 @@
14240# report actual input values of CONFIG_FILES etc. instead of their14250# report actual input values of CONFIG_FILES etc. instead of their
14241# values after options handling.14251# values after options handling.
14242ac_log="14252ac_log="
14243This file was extended by libdbusmenu $as_me 0.3.3, which was14253This file was extended by libdbusmenu $as_me 0.3.4, which was
14244generated by GNU Autoconf 2.65. Invocation command line was14254generated by GNU Autoconf 2.65. Invocation command line was
1424514255
14246 CONFIG_FILES = $CONFIG_FILES14256 CONFIG_FILES = $CONFIG_FILES
@@ -14306,7 +14316,7 @@
14306cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114316cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14307ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14317ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14308ac_cs_version="\\14318ac_cs_version="\\
14309libdbusmenu config.status 0.3.314319libdbusmenu config.status 0.3.4
14310configured by $0, generated by GNU Autoconf 2.65,14320configured by $0, generated by GNU Autoconf 2.65,
14311 with options \\"\$ac_cs_config\\"14321 with options \\"\$ac_cs_config\\"
1431214322
@@ -14698,6 +14708,7 @@
14698 "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;14708 "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
14699 "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;;14709 "tools/testapp/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testapp/Makefile" ;;
14700 "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;14710 "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
14711 "tests/dbusmenu-jsonloader.pc") CONFIG_FILES="$CONFIG_FILES tests/dbusmenu-jsonloader.pc" ;;
14701 "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;14712 "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
14702 "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;;14713 "docs/libdbusmenu-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/Makefile" ;;
14703 "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;;14714 "docs/libdbusmenu-glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libdbusmenu-glib/reference/Makefile" ;;
1470414715
=== modified file 'configure.ac'
--- configure.ac 2010-06-24 14:27:00 +0000
+++ configure.ac 2010-07-01 14:04:28 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.3.3, ted@canonical.com)2AC_INIT(libdbusmenu, 0.3.4, 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.3, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.3.4, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -62,8 +62,10 @@
62###########################62###########################
6363
64JSON_GLIB_REQUIRED_VERSION=0.6.064JSON_GLIB_REQUIRED_VERSION=0.6.0
65GIO_UNIX_REQUIRED_VERSION=2.24
6566
66PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION)67PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
68 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
6769
68AC_SUBST(DBUSMENUTESTS_CFLAGS)70AC_SUBST(DBUSMENUTESTS_CFLAGS)
69AC_SUBST(DBUSMENUTESTS_LIBS)71AC_SUBST(DBUSMENUTESTS_LIBS)
@@ -85,7 +87,7 @@
85###########################87###########################
8688
87LIBDBUSMENU_CURRENT=189LIBDBUSMENU_CURRENT=1
88LIBDBUSMENU_REVISION=890LIBDBUSMENU_REVISION=9
89LIBDBUSMENU_AGE=091LIBDBUSMENU_AGE=0
9092
91AC_SUBST(LIBDBUSMENU_CURRENT)93AC_SUBST(LIBDBUSMENU_CURRENT)
@@ -126,6 +128,7 @@
126tools/Makefile128tools/Makefile
127tools/testapp/Makefile129tools/testapp/Makefile
128tests/Makefile130tests/Makefile
131tests/dbusmenu-jsonloader.pc
129docs/Makefile132docs/Makefile
130docs/libdbusmenu-glib/Makefile133docs/libdbusmenu-glib/Makefile
131docs/libdbusmenu-glib/reference/Makefile134docs/libdbusmenu-glib/reference/Makefile
132135
=== modified file 'debian/changelog'
--- debian/changelog 2010-06-24 16:18:44 +0000
+++ debian/changelog 2010-07-01 14:04:28 +0000
@@ -1,3 +1,14 @@
1libdbusmenu (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
2
3 * New upstream release.
4 * Block building submenus on separators (LP: #598620)
5 * Adding more through JSON support for testing
6 * Fixing up value handling in dbusmenu-dumper
7 * debian/control, debian/libdbusmenu-jsonloader*install: Adding
8 two binary packages for the jsonloader test library.
9
10 -- Ted Gould <ted@ubuntu.com> Thu, 01 Jul 2010 09:00:16 -0500
11
1libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low12libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
213
3 * New upstream release.14 * New upstream release.
415
=== modified file 'debian/control'
--- debian/control 2010-06-16 15:39:20 +0000
+++ debian/control 2010-07-01 14:04:28 +0000
@@ -149,3 +149,32 @@
149 .149 .
150 This package contains developer documentation for libdbusmenu-gtk.150 This package contains developer documentation for libdbusmenu-gtk.
151151
152Package: libdbusmenu-jsonloader1
153Section: libs
154Architecture: any
155Depends: ${shlibs:Depends},
156 ${misc:Depends}
157Description: library for passing menus over DBus - Test lib
158 libdbusmenu passes a menu structure across DBus so that a program can
159 create a menu simply without worrying about how it is displayed on the
160 other side of the bus.
161 .
162 This package contains shared libraries to be by test suites in applications
163 or libraries using dbusmenu.
164
165Package: libdbusmenu-jsonloader-dev
166Section: libdevel
167Architecture: any
168Depends: ${shlibs:Depends},
169 ${misc:Depends},
170 libdbus-glib-1-dev (>= 0.76),
171 libdbusmenu-glib-dev (= ${binary:Version}),
172 libjson-glib-dev
173Description: library for passing menus over DBus - Test lib
174 libdbusmenu passes a menu structure across DBus so that a program can
175 create a menu simply without worrying about how it is displayed on the
176 other side of the bus.
177 .
178 This package contains files that are needed to build test suites in applications
179 or libraries using dbusmenu.
180
152181
=== added file 'debian/libdbusmenu-jsonloader-dev.install'
--- debian/libdbusmenu-jsonloader-dev.install 1970-01-01 00:00:00 +0000
+++ debian/libdbusmenu-jsonloader-dev.install 2010-07-01 14:04:28 +0000
@@ -0,0 +1,4 @@
1debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/*
2debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc
3debian/tmp/usr/lib/libdbusmenu-jsonloader.a
4debian/tmp/usr/lib/libdbusmenu-jsonloader.so
05
=== added file 'debian/libdbusmenu-jsonloader1.install'
--- debian/libdbusmenu-jsonloader1.install 1970-01-01 00:00:00 +0000
+++ debian/libdbusmenu-jsonloader1.install 2010-07-01 14:04:28 +0000
@@ -0,0 +1,1 @@
1debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*
02
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html 2010-07-01 14:04:28 +0000
@@ -21,7 +21,7 @@
21</tr></table>21</tr></table>
22<div class="chapter" title="API">22<div class="chapter" title="API">
23<div class="titlepage"><div><div><h2 class="title">23<div class="titlepage"><div><div><h2 class="title">
24<a name="id339465"></a>API</h2></div></div></div>24<a name="id390460"></a>API</h2></div></div></div>
25<div class="toc"><dl>25<div class="toc"><dl>
26<dt>26<dt>
27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>27<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span>
2828
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html 2010-07-01 14:04:28 +0000
@@ -455,6 +455,7 @@
455<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>455<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
456<td>456<td>
457<em class="parameter"><code>gpointer</code></em> user_data:457<em class="parameter"><code>gpointer</code></em> user_data:
458<em class="parameter"><code>gpointer</code></em> user_data:
458</td>459</td>
459</tr>460</tr>
460<tr>461<tr>
461462
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2010-06-24 14:21:02 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html 2010-07-01 14:04:28 +0000
@@ -287,7 +287,7 @@
287<hr>287<hr>
288<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY">288<div class="refsect2" title="DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY">
289<a name="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</h3>289<a name="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</h3>
290<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display"290<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display"
291</pre>291</pre>
292<p>292<p>
293</p>293</p>
294294
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml 2010-07-01 14:04:28 +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/client.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/client.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/client.sgml 2010-07-01 14:04:28 +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
@@ -159,6 +157,7 @@
159157
160@client: 158@client:
161@id: 159@id:
160@gpointer user_data:
162@gpointer user_data: 161@gpointer user_data:
163@cb_data: 162@cb_data:
164163
165164
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml 2010-07-01 14:04:28 +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 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml 2010-07-01 14:04:28 +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
@@ -507,6 +505,7 @@
507</para>505</para>
508506
509@mi: 507@mi:
508@DbusmenuMenuitem * mi, gpointer data:
510@DbusmenuMenuitem * mi, gpointer data: 509@DbusmenuMenuitem * mi, gpointer data:
511@data: 510@data:
512511
513512
=== modified file 'docs/libdbusmenu-glib/reference/tmpl/server.sgml'
--- docs/libdbusmenu-glib/reference/tmpl/server.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/tmpl/server.sgml 2010-07-01 14:04:28 +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 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2010-07-01 14:04:28 +0000
@@ -1,1 +1,1 @@
10.3.310.3.4
22
=== modified file 'docs/libdbusmenu-glib/reference/xml/client.xml'
--- docs/libdbusmenu-glib/reference/xml/client.xml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/xml/client.xml 2010-07-01 14:04:28 +0000
@@ -342,6 +342,7 @@
342<varlistentry><term><parameter>id</parameter>&#160;:</term>342<varlistentry><term><parameter>id</parameter>&#160;:</term>
343<listitem><simpara>343<listitem><simpara>
344<parameter>gpointer</parameter> user_data:344<parameter>gpointer</parameter> user_data:
345<parameter>gpointer</parameter> user_data:
345</simpara></listitem></varlistentry>346</simpara></listitem></varlistentry>
346<varlistentry><term><parameter>cb_data</parameter>&#160;:</term>347<varlistentry><term><parameter>cb_data</parameter>&#160;:</term>
347<listitem><simpara>348<listitem><simpara>
348349
=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
--- docs/libdbusmenu-glib/reference/xml/menuitem.xml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml 2010-07-01 14:04:28 +0000
@@ -257,7 +257,7 @@
257<refsect2 id="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS" role="macro">257<refsect2 id="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS" role="macro">
258<title>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</title>258<title>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</title>
259<indexterm zone="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"><primary>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</primary></indexterm>259<indexterm zone="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"><primary>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</primary></indexterm>
260<programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display"260<programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display"
261</programlisting>261</programlisting>
262<para>262<para>
263</para></refsect2>263</para></refsect2>
264264
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html 2010-07-01 14:04:28 +0000
@@ -21,7 +21,7 @@
21</tr></table>21</tr></table>
22<div class="chapter" title="API">22<div class="chapter" title="API">
23<div class="titlepage"><div><div><h2 class="title">23<div class="titlepage"><div><div><h2 class="title">
24<a name="id422170"></a>API</h2></div></div></div>24<a name="id512726"></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"></span>27<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"></span>
2828
=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html'
--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html 2010-07-01 14:04:28 +0000
@@ -43,14 +43,14 @@
43<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>,43<span class="returnvalue">DbusmenuGtkClient</span> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-new" title="dbusmenu_gtkclient_new ()">dbusmenu_gtkclient_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_name</code></em>,
44 <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>);44 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *dbus_object</code></em>);
45<a href="/usr/share/gtk-doc/html/gtk/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>,45<a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get" title="dbusmenu_gtkclient_menuitem_get ()">dbusmenu_gtkclient_menuitem_get</a> (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
46 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);46 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);
47<a href="/usr/share/gtk-doc/html/gtk/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>47<a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libdbusmenu-gtk-DbusmenuGtkClient.html#dbusmenu-gtkclient-menuitem-get-submenu" title="dbusmenu_gtkclient_menuitem_get_submenu ()">dbusmenu_gtkclient_menuitem_get_submenu</a>
48 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,48 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
49 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);49 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> *item</code></em>);
50<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>,50<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>,
51 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>,51 <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>,
52 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,52 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
53 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>);53 <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>);
54</pre>54</pre>
55</div>55</div>
56<div class="refsect1" title="Description">56<div class="refsect1" title="Description">
@@ -95,7 +95,7 @@
95<col align="left" valign="top">95<col align="left" valign="top">
96<tbody>96<tbody>
97<tr>97<tr>
98<td><p><span class="term"><span class="type">DbusmenuClientClass</span> <em class="structfield"><code><a name="DbusmenuGtkClientClass.parent-class"></a>parent_class</code></em>;</span></p></td>98<td><p><span class="term"><a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClientClass"><span class="type">DbusmenuClientClass</span></a> <em class="structfield"><code><a name="DbusmenuGtkClientClass.parent-class"></a>parent_class</code></em>;</span></p></td>
99<td>99<td>
100<span class="type">GtkMenuClass</span>100<span class="type">GtkMenuClass</span>
101</td>101</td>
@@ -134,15 +134,15 @@
134<pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkclient_new (<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>,134<pre class="programlisting"><span class="returnvalue">DbusmenuGtkClient</span> * dbusmenu_gtkclient_new (<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>,
135 <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>);</pre>135 <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>);</pre>
136<p>136<p>
137Creates a new <span class="type">DbusmenuGtkClient</span> object and creates a <span class="type">DbusmenuClient</span>137Creates a new <span class="type">DbusmenuGtkClient</span> object and creates a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a>
138 that connects across DBus to a <span class="type">DbusmenuServer</span>.138 that connects across DBus to a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>.
139</p>139</p>
140<div class="variablelist"><table border="0">140<div class="variablelist"><table border="0">
141<col align="left" valign="top">141<col align="left" valign="top">
142<tbody>142<tbody>
143<tr>143<tr>
144<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>144<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>
145<td>Name of the <span class="type">DbusmenuServer</span> on DBus145<td>Name of the <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a> on DBus
146</td>146</td>
147</tr>147</tr>
148<tr>148<tr>
@@ -162,10 +162,10 @@
162<div class="refsect2" title="dbusmenu_gtkclient_menuitem_get ()">162<div class="refsect2" title="dbusmenu_gtkclient_menuitem_get ()">
163<a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>163<a name="dbusmenu-gtkclient-menuitem-get"></a><h3>dbusmenu_gtkclient_menuitem_get ()</h3>
164<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,164<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="returnvalue">GtkMenuItem</span></a> * dbusmenu_gtkclient_menuitem_get (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
165 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre>165 <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>
166<p>166<p>
167This grabs the <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the167This grabs the <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> that is associated with the
168 <span class="type">DbusmenuMenuitem</span>.168 <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>.
169</p>169</p>
170<div class="variablelist"><table border="0">170<div class="variablelist"><table border="0">
171<col align="left" valign="top">171<col align="left" valign="top">
@@ -178,7 +178,7 @@
178<tr>178<tr>
179<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>179<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
180<td>180<td>
181<span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on.181<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="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> on.
182</td>182</td>
183</tr>183</tr>
184<tr>184<tr>
@@ -194,7 +194,7 @@
194<a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>194<a name="dbusmenu-gtkclient-menuitem-get-submenu"></a><h3>dbusmenu_gtkclient_menuitem_get_submenu ()</h3>
195<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu195<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * dbusmenu_gtkclient_menuitem_get_submenu
196 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,196 (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
197 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>);</pre>197 <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>
198<p>198<p>
199This grabs the submenu associated with the menuitem.199This grabs the submenu associated with the menuitem.
200</p>200</p>
@@ -209,7 +209,7 @@
209<tr>209<tr>
210<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>210<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
211<td>211<td>
212<span class="type">DbusmenuMenuitem</span> to get associated <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> on.212<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="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> on.
213</td>213</td>
214</tr>214</tr>
215<tr>215<tr>
@@ -224,9 +224,9 @@
224<div class="refsect2" title="dbusmenu_gtkclient_newitem_base ()">224<div class="refsect2" title="dbusmenu_gtkclient_newitem_base ()">
225<a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>225<a name="dbusmenu-gtkclient-newitem-base"></a><h3>dbusmenu_gtkclient_newitem_base ()</h3>
226<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,226<pre class="programlisting"><span class="returnvalue">void</span> dbusmenu_gtkclient_newitem_base (<em class="parameter"><code><span class="type">DbusmenuGtkClient</span> *client</code></em>,
227 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *item</code></em>,227 <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>,
228 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,228 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenuItem.html"><span class="type">GtkMenuItem</span></a> *gmi</code></em>,
229 <em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *parent</code></em>);</pre>229 <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>
230<p>230<p>
231This function provides some of the basic connectivity for being in231This function provides some of the basic connectivity for being in
232 the GTK world. Things like visibility and sensitivity of the item are232 the GTK world. Things like visibility and sensitivity of the item are
@@ -236,7 +236,7 @@
236</p>236</p>
237<p>237<p>
238 This also handles passing the "activate" signal back to the238 This also handles passing the "activate" signal back to the
239 <span class="type">DbusmenuMenuitem</span> side of thing.239 <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> side of thing.
240</p>240</p>
241<div class="variablelist"><table border="0">241<div class="variablelist"><table border="0">
242<col align="left" valign="top">242<col align="left" valign="top">
@@ -248,7 +248,7 @@
248</tr>248</tr>
249<tr>249<tr>
250<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>250<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
251<td>The <span class="type">DbusmenuMenuitem</span> to attach the GTK-isms to251<td>The <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to attach the GTK-isms to
252</td>252</td>
253</tr>253</tr>
254<tr>254<tr>
@@ -258,7 +258,7 @@
258</tr>258</tr>
259<tr>259<tr>
260<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>260<td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
261<td>The parent <span class="type">DbusmenuMenuitem</span>261<td>The parent <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a>
262</td>262</td>
263</tr>263</tr>
264</tbody>264</tbody>
265265
=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html'
--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html 2010-07-01 14:04:28 +0000
@@ -109,15 +109,15 @@
109<pre class="programlisting"><span class="returnvalue">DbusmenuGtkMenu</span> * dbusmenu_gtkmenu_new (<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>,109<pre class="programlisting"><span class="returnvalue">DbusmenuGtkMenu</span> * dbusmenu_gtkmenu_new (<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>,
110 <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>);</pre>110 <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>);</pre>
111<p>111<p>
112Creates a new <span class="type">DbusmenuGtkMenu</span> object and creates a <span class="type">DbusmenuClient</span>112Creates a new <span class="type">DbusmenuGtkMenu</span> object and creates a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a>
113 that connects across DBus to a <span class="type">DbusmenuServer</span>.113 that connects across DBus to a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>.
114</p>114</p>
115<div class="variablelist"><table border="0">115<div class="variablelist"><table border="0">
116<col align="left" valign="top">116<col align="left" valign="top">
117<tbody>117<tbody>
118<tr>118<tr>
119<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>119<td><p><span class="term"><em class="parameter"><code>dbus_name</code></em> :</span></p></td>
120<td>Name of the <span class="type">DbusmenuServer</span> on DBus120<td>Name of the <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a> on DBus
121</td>121</td>
122</tr>122</tr>
123<tr>123<tr>
124124
=== modified file 'docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html'
--- docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html 2010-07-01 14:04:28 +0000
@@ -38,11 +38,11 @@
38<div class="refsynopsisdiv" title="Synopsis">38<div class="refsynopsisdiv" title="Synopsis">
39<a name="libdbusmenu-gtk-menuitem.synopsis"></a><h2>Synopsis</h2>39<a name="libdbusmenu-gtk-menuitem.synopsis"></a><h2>Synopsis</h2>
40<pre class="synopsis"><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-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a>40<pre class="synopsis"><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-image" title="dbusmenu_menuitem_property_set_image ()">dbusmenu_menuitem_property_set_image</a>
41 (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,41 (<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>,
42 <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> *property</code></em>,42 <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> *property</code></em>,
43 <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);43 <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);
44<a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a>44<a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * <a class="link" href="libdbusmenu-gtk-menuitem.html#dbusmenu-menuitem-property-get-image" title="dbusmenu_menuitem_property_get_image ()">dbusmenu_menuitem_property_get_image</a>
45 (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,45 (<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>,
46 <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> *property</code></em>);46 <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> *property</code></em>);
47</pre>47</pre>
48</div>48</div>
@@ -56,20 +56,20 @@
56<div class="refsect2" title="dbusmenu_menuitem_property_set_image ()">56<div class="refsect2" title="dbusmenu_menuitem_property_set_image ()">
57<a name="dbusmenu-menuitem-property-set-image"></a><h3>dbusmenu_menuitem_property_set_image ()</h3>57<a name="dbusmenu-menuitem-property-set-image"></a><h3>dbusmenu_menuitem_property_set_image ()</h3>
58<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_image58<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_image
59 (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,59 (<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>,
60 <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> *property</code></em>,60 <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> *property</code></em>,
61 <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);</pre>61 <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="type">GdkPixbuf</span></a> *data</code></em>);</pre>
62<p>62<p>
63This function takes the pixbuf that is stored in <em class="parameter"><code>data</code></em> and63This function takes the pixbuf that is stored in <em class="parameter"><code>data</code></em> and
64 turns it into a base64 encoded PNG so that it can be placed64 turns it into a base64 encoded PNG so that it can be placed
65 onto a standard <span class="type">DbusmenuMenuitem</span> property.65 onto a standard <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> property.
66</p>66</p>
67<div class="variablelist"><table border="0">67<div class="variablelist"><table border="0">
68<col align="left" valign="top">68<col align="left" valign="top">
69<tbody>69<tbody>
70<tr>70<tr>
71<td><p><span class="term"><em class="parameter"><code>menuitem</code></em> :</span></p></td>71<td><p><span class="term"><em class="parameter"><code>menuitem</code></em> :</span></p></td>
72<td>The <span class="type">DbusmenuMenuitem</span> to set the property on.72<td>The <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html#DbusmenuMenuitem"><span class="type">DbusmenuMenuitem</span></a> to set the property on.
73</td>73</td>
74</tr>74</tr>
75<tr>75<tr>
@@ -95,7 +95,7 @@
95<div class="refsect2" title="dbusmenu_menuitem_property_get_image ()">95<div class="refsect2" title="dbusmenu_menuitem_property_get_image ()">
96<a name="dbusmenu-menuitem-property-get-image"></a><h3>dbusmenu_menuitem_property_get_image ()</h3>96<a name="dbusmenu-menuitem-property-get-image"></a><h3>dbusmenu_menuitem_property_get_image ()</h3>
97<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * dbusmenu_menuitem_property_get_image97<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"><span class="returnvalue">GdkPixbuf</span></a> * dbusmenu_menuitem_property_get_image
98 (<em class="parameter"><code><span class="type">DbusmenuMenuitem</span> *menuitem</code></em>,98 (<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>,
99 <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> *property</code></em>);</pre>99 <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> *property</code></em>);</pre>
100<p>100<p>
101This function looks on the menu item for a property by the101This function looks on the menu item for a property by the
102102
=== modified file 'docs/libdbusmenu-gtk/reference/tmpl/client.sgml'
--- docs/libdbusmenu-gtk/reference/tmpl/client.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-gtk/reference/tmpl/client.sgml 2010-07-01 14:04:28 +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-gtk/reference/tmpl/genericmenuitem.sgml'
--- docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-gtk/reference/tmpl/genericmenuitem.sgml 2010-07-01 14:04:28 +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-gtk/reference/tmpl/menu.sgml'
--- docs/libdbusmenu-gtk/reference/tmpl/menu.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-gtk/reference/tmpl/menu.sgml 2010-07-01 14:04:28 +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-gtk/reference/tmpl/menuitem.sgml'
--- docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml 2010-06-10 17:33:17 +0000
+++ docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml 2010-07-01 14:04:28 +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-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2010-06-24 14:27:00 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2010-07-01 14:04:28 +0000
@@ -1,1 +1,1 @@
10.3.310.3.4
22
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c 2010-06-22 21:29:08 +0000
+++ libdbusmenu-gtk/client.c 2010-07-01 14:04:28 +0000
@@ -503,6 +503,7 @@
503 #endif503 #endif
504504
505 if (dbusmenu_menuitem_get_root(mi)) { return; }505 if (dbusmenu_menuitem_get_root(mi)) { return; }
506 if (g_strcmp0(dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE), DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0) { return; }
506507
507 gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu);508 gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu);
508 GtkMenu * menu = GTK_MENU(ann_menu);509 GtkMenu * menu = GTK_MENU(ann_menu);
509510
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2010-06-21 19:47:08 +0000
+++ tests/Makefile.am 2010-07-01 14:04:28 +0000
@@ -1,14 +1,17 @@
11
2DBUS_RUNNER=dbus-test-runner2DBUS_RUNNER=dbus-test-runner
33
4CLEANFILES=
5
4TESTS = \6TESTS = \
5 test-glib-objects-test \7 test-glib-objects-test \
6 test-glib-layout \8 test-glib-layout \
7 test-glib-properties \9 test-glib-properties \
8 test-glib-proxy \10 test-glib-proxy \
9 test-glib-simple-items \11 test-glib-simple-items \
12 test-glib-submenu \
13 test-json \
10 test-gtk-objects-test \14 test-gtk-objects-test \
11 test-glib-submenu \
12 test-gtk-label \15 test-gtk-label \
13 test-gtk-shortcut \16 test-gtk-shortcut \
14 test-gtk-reorder17 test-gtk-reorder
@@ -31,11 +34,50 @@
31 test-gtk-shortcut-client \34 test-gtk-shortcut-client \
32 test-gtk-shortcut-server \35 test-gtk-shortcut-server \
33 test-glib-simple-items \36 test-glib-simple-items \
34 test-gtk-reorder-server37 test-gtk-reorder-server \
38 test-json-client \
39 test-json-server
3540
36XVFB_RUN=". $(srcdir)/run-xvfb.sh"41XVFB_RUN=". $(srcdir)/run-xvfb.sh"
3742
38######################43######################
44# JSON Loader lib
45######################
46
47lib_LTLIBRARIES = libdbusmenu-jsonloader.la
48
49libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/
50
51libdbusmenu_jsonloaderinclude_HEADERS = \
52 json-loader.h
53
54libdbusmenu_jsonloader_la_SOURCES = \
55 json-loader.h \
56 json-loader.c
57
58libdbusmenu_jsonloader_la_LDFLAGS = \
59 -version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \
60 -no-undefined \
61 -export-symbols-regex "^[^_].*"
62
63libdbusmenu_jsonloader_la_CFLAGS = \
64 $(DBUSMENUGLIB_CFLAGS) \
65 $(DBUSMENUTESTS_CFLAGS) \
66 -I $(srcdir)/.. \
67 -Wall \
68 -Werror \
69 -DG_DISABLE_DEPRECATED \
70 -DG_LOG_DOMAIN="\"LIBDBUSMENU-JSONLOADER\""
71
72libdbusmenu_jsonloader_la_LIBADD = \
73 ../libdbusmenu-glib/libdbusmenu-glib.la \
74 $(DBUSMENUGLIB_LIBS) \
75 $(DBUSMENUTESTS_LIBS)
76
77pkgconfig_DATA = dbusmenu-jsonloader.pc
78pkgconfigdir = $(libdir)/pkgconfig
79
80######################
39# Test GLib server81# Test GLib server
40######################82######################
4183
@@ -84,6 +126,47 @@
84 $(DBUSMENUGLIB_LIBS)126 $(DBUSMENUGLIB_LIBS)
85127
86######################128######################
129# Test JSON
130######################
131
132test-json: test-json-client test-json-server Makefile.am
133 @echo "#!/bin/bash" > $@
134 @echo $(XVFB_RUN) >> $@
135 @echo $(DBUS_RUNNER) --task ./test-json-client --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@
136 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
137 @chmod +x $@
138
139CLEANFILES += test-json-01.output.json
140
141test_json_server_SOURCES = \
142 test-json-server.c
143
144test_json_server_CFLAGS = \
145 -I $(srcdir)/.. \
146 -I $(srcdir) \
147 $(DBUSMENUGLIB_CFLAGS) \
148 $(DBUSMENUTESTS_CFLAGS) \
149 -Wall -Werror
150
151test_json_server_LDADD = \
152 ../libdbusmenu-glib/libdbusmenu-glib.la \
153 libdbusmenu-jsonloader.la \
154 $(DBUSMENUTESTS_LIBS) \
155 $(DBUSMENUGLIB_LIBS)
156
157test_json_client_SOURCES = \
158 test-json-client.c
159
160test_json_client_CFLAGS = \
161 -I $(srcdir)/.. \
162 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
163
164test_json_client_LDADD = \
165 ../libdbusmenu-glib/libdbusmenu-glib.la \
166 $(DBUSMENUTESTS_LIBS) \
167 $(DBUSMENUGLIB_LIBS)
168
169######################
87# Test Glib Submenu170# Test Glib Submenu
88######################171######################
89172
@@ -286,6 +369,7 @@
286test_gtk_label_server_LDADD = \369test_gtk_label_server_LDADD = \
287 ../libdbusmenu-glib/libdbusmenu-glib.la \370 ../libdbusmenu-glib/libdbusmenu-glib.la \
288 ../libdbusmenu-gtk/libdbusmenu-gtk.la \371 ../libdbusmenu-gtk/libdbusmenu-gtk.la \
372 libdbusmenu-jsonloader.la \
289 $(DBUSMENUGTK_LIBS) \373 $(DBUSMENUGTK_LIBS) \
290 $(DBUSMENUTESTS_LIBS)374 $(DBUSMENUTESTS_LIBS)
291375
@@ -421,9 +505,10 @@
421 dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \505 dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \
422 dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \506 dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \
423 dbusmenu-gtk/mago_tests/data/static.json \507 dbusmenu-gtk/mago_tests/data/static.json \
424 dbusmenu-gtk/mago_tests/data/test-gtk-label.json508 dbusmenu-gtk/mago_tests/data/test-gtk-label.json \
509 test-json-01.json
425510
426CLEANFILES = \511CLEANFILES += \
427 dbusmenu-gtk/mago_tests/dbusmenu.pyc512 dbusmenu-gtk/mago_tests/dbusmenu.pyc
428513
429distclean-local:514distclean-local:
430515
=== modified file 'tests/Makefile.in'
--- tests/Makefile.in 2010-06-24 14:27:00 +0000
+++ tests/Makefile.in 2010-07-01 14:04:28 +0000
@@ -15,6 +15,8 @@
1515
16@SET_MAKE@16@SET_MAKE@
1717
18
19
18VPATH = @srcdir@20VPATH = @srcdir@
19pkgdatadir = $(datadir)/@PACKAGE@21pkgdatadir = $(datadir)/@PACKAGE@
20pkgincludedir = $(includedir)/@PACKAGE@22pkgincludedir = $(includedir)/@PACKAGE@
@@ -36,8 +38,8 @@
36host_triplet = @host@38host_triplet = @host@
37TESTS = test-glib-objects-test test-glib-layout test-glib-properties \39TESTS = test-glib-objects-test test-glib-layout test-glib-properties \
38 test-glib-proxy test-glib-simple-items$(EXEEXT) \40 test-glib-proxy test-glib-simple-items$(EXEEXT) \
39 test-gtk-objects-test test-glib-submenu test-gtk-label \41 test-glib-submenu test-json test-gtk-objects-test \
40 test-gtk-shortcut test-gtk-reorder42 test-gtk-label test-gtk-shortcut test-gtk-reorder
41check_PROGRAMS = glib-server-nomenu$(EXEEXT) \43check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
42 test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \44 test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \
43 test-glib-layout-server$(EXEEXT) \45 test-glib-layout-server$(EXEEXT) \
@@ -51,26 +53,65 @@
51 test-gtk-shortcut-client$(EXEEXT) \53 test-gtk-shortcut-client$(EXEEXT) \
52 test-gtk-shortcut-server$(EXEEXT) \54 test-gtk-shortcut-server$(EXEEXT) \
53 test-glib-simple-items$(EXEEXT) \55 test-glib-simple-items$(EXEEXT) \
54 test-gtk-reorder-server$(EXEEXT)56 test-gtk-reorder-server$(EXEEXT) test-json-client$(EXEEXT) \
57 test-json-server$(EXEEXT)
55subdir = tests58subdir = tests
56DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in59DIST_COMMON = $(libdbusmenu_jsonloaderinclude_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(srcdir)/dbusmenu-jsonloader.pc.in
57ACLOCAL_M4 = $(top_srcdir)/aclocal.m462ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
58am__aclocal_m4_deps = $(top_srcdir)/configure.ac63am__aclocal_m4_deps = $(top_srcdir)/configure.ac
59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \64am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
60 $(ACLOCAL_M4)65 $(ACLOCAL_M4)
61mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs66mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
62CONFIG_HEADER = $(top_builddir)/config.h67CONFIG_HEADER = $(top_builddir)/config.h
63CONFIG_CLEAN_FILES =68CONFIG_CLEAN_FILES = dbusmenu-jsonloader.pc
64CONFIG_CLEAN_VPATH_FILES =69CONFIG_CLEAN_VPATH_FILES =
70am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
71am__vpath_adj = case $$p in \
72 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
73 *) f=$$p;; \
74 esac;
75am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
76am__install_max = 40
77am__nobase_strip_setup = \
78 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
79am__nobase_strip = \
80 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
81am__nobase_list = $(am__nobase_strip_setup); \
82 for p in $$list; do echo "$$p $$p"; done | \
83 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
84 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
85 if (++n[$$2] == $(am__install_max)) \
86 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
87 END { for (dir in files) print dir, files[dir] }'
88am__base_list = \
89 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
90 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
91am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" \
92 "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" \
93 "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"
94LTLIBRARIES = $(lib_LTLIBRARIES)
95am__DEPENDENCIES_1 =
96libdbusmenu_jsonloader_la_DEPENDENCIES = \
97 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \
98 $(am__DEPENDENCIES_1)
99am_libdbusmenu_jsonloader_la_OBJECTS = \
100 libdbusmenu_jsonloader_la-json-loader.lo
101libdbusmenu_jsonloader_la_OBJECTS = \
102 $(am_libdbusmenu_jsonloader_la_OBJECTS)
103AM_V_lt = $(am__v_lt_$(V))
104am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
105am__v_lt_0 = --silent
106libdbusmenu_jsonloader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
107 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
108 $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) \
109 $(libdbusmenu_jsonloader_la_LDFLAGS) $(LDFLAGS) -o $@
65am_glib_server_nomenu_OBJECTS = \110am_glib_server_nomenu_OBJECTS = \
66 glib_server_nomenu-glib-server-nomenu.$(OBJEXT)111 glib_server_nomenu-glib-server-nomenu.$(OBJEXT)
67glib_server_nomenu_OBJECTS = $(am_glib_server_nomenu_OBJECTS)112glib_server_nomenu_OBJECTS = $(am_glib_server_nomenu_OBJECTS)
68am__DEPENDENCIES_1 =
69glib_server_nomenu_DEPENDENCIES = \113glib_server_nomenu_DEPENDENCIES = \
70 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)114 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
71AM_V_lt = $(am__v_lt_$(V))
72am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
73am__v_lt_0 = --silent
74glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \115glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
75 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \116 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
76 $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \117 $(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -194,7 +235,8 @@
194test_gtk_label_server_OBJECTS = $(am_test_gtk_label_server_OBJECTS)235test_gtk_label_server_OBJECTS = $(am_test_gtk_label_server_OBJECTS)
195test_gtk_label_server_DEPENDENCIES = \236test_gtk_label_server_DEPENDENCIES = \
196 ../libdbusmenu-glib/libdbusmenu-glib.la \237 ../libdbusmenu-glib/libdbusmenu-glib.la \
197 ../libdbusmenu-gtk/libdbusmenu-gtk.la $(am__DEPENDENCIES_1) \238 ../libdbusmenu-gtk/libdbusmenu-gtk.la \
239 libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \
198 $(am__DEPENDENCIES_1)240 $(am__DEPENDENCIES_1)
199test_gtk_label_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \241test_gtk_label_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
200 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \242 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -247,6 +289,27 @@
247 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \289 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
248 $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \290 $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
249 $(LDFLAGS) -o $@291 $(LDFLAGS) -o $@
292am_test_json_client_OBJECTS = \
293 test_json_client-test-json-client.$(OBJEXT)
294test_json_client_OBJECTS = $(am_test_json_client_OBJECTS)
295test_json_client_DEPENDENCIES = \
296 ../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1) \
297 $(am__DEPENDENCIES_1)
298test_json_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
299 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
300 $(test_json_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
301 -o $@
302am_test_json_server_OBJECTS = \
303 test_json_server-test-json-server.$(OBJEXT)
304test_json_server_OBJECTS = $(am_test_json_server_OBJECTS)
305test_json_server_DEPENDENCIES = \
306 ../libdbusmenu-glib/libdbusmenu-glib.la \
307 libdbusmenu-jsonloader.la $(am__DEPENDENCIES_1) \
308 $(am__DEPENDENCIES_1)
309test_json_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
310 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
311 $(test_json_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
312 -o $@
250DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)313DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
251depcomp = $(SHELL) $(top_srcdir)/depcomp314depcomp = $(SHELL) $(top_srcdir)/depcomp
252am__depfiles_maybe = depfiles315am__depfiles_maybe = depfiles
@@ -273,63 +336,46 @@
273AM_V_GEN = $(am__v_GEN_$(V))336AM_V_GEN = $(am__v_GEN_$(V))
274am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))337am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
275am__v_GEN_0 = @echo " GEN " $@;338am__v_GEN_0 = @echo " GEN " $@;
276SOURCES = $(glib_server_nomenu_SOURCES) \339SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
277 $(test_glib_layout_client_SOURCES) \340 $(glib_server_nomenu_SOURCES) \
278 $(test_glib_layout_server_SOURCES) \341 $(test_glib_layout_client_SOURCES) \
279 $(test_glib_objects_SOURCES) \342 $(test_glib_layout_server_SOURCES) \
280 $(test_glib_properties_client_SOURCES) \343 $(test_glib_objects_SOURCES) \
281 $(test_glib_properties_server_SOURCES) \344 $(test_glib_properties_client_SOURCES) \
282 $(test_glib_proxy_client_SOURCES) \345 $(test_glib_properties_server_SOURCES) \
283 $(test_glib_proxy_proxy_SOURCES) \346 $(test_glib_proxy_client_SOURCES) \
284 $(test_glib_proxy_server_SOURCES) \347 $(test_glib_proxy_proxy_SOURCES) \
285 $(test_glib_simple_items_SOURCES) \348 $(test_glib_proxy_server_SOURCES) \
286 $(test_glib_submenu_client_SOURCES) \349 $(test_glib_simple_items_SOURCES) \
287 $(test_glib_submenu_server_SOURCES) \350 $(test_glib_submenu_client_SOURCES) \
288 $(test_gtk_label_client_SOURCES) \351 $(test_glib_submenu_server_SOURCES) \
289 $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \352 $(test_gtk_label_client_SOURCES) \
290 $(test_gtk_reorder_server_SOURCES) \353 $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \
291 $(test_gtk_shortcut_client_SOURCES) \354 $(test_gtk_reorder_server_SOURCES) \
292 $(test_gtk_shortcut_server_SOURCES)355 $(test_gtk_shortcut_client_SOURCES) \
293DIST_SOURCES = $(glib_server_nomenu_SOURCES) \356 $(test_gtk_shortcut_server_SOURCES) \
294 $(test_glib_layout_client_SOURCES) \357 $(test_json_client_SOURCES) $(test_json_server_SOURCES)
295 $(test_glib_layout_server_SOURCES) \358DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
296 $(test_glib_objects_SOURCES) \359 $(glib_server_nomenu_SOURCES) \
297 $(test_glib_properties_client_SOURCES) \360 $(test_glib_layout_client_SOURCES) \
298 $(test_glib_properties_server_SOURCES) \361 $(test_glib_layout_server_SOURCES) \
299 $(test_glib_proxy_client_SOURCES) \362 $(test_glib_objects_SOURCES) \
300 $(test_glib_proxy_proxy_SOURCES) \363 $(test_glib_properties_client_SOURCES) \
301 $(test_glib_proxy_server_SOURCES) \364 $(test_glib_properties_server_SOURCES) \
302 $(test_glib_simple_items_SOURCES) \365 $(test_glib_proxy_client_SOURCES) \
303 $(test_glib_submenu_client_SOURCES) \366 $(test_glib_proxy_proxy_SOURCES) \
304 $(test_glib_submenu_server_SOURCES) \367 $(test_glib_proxy_server_SOURCES) \
305 $(test_gtk_label_client_SOURCES) \368 $(test_glib_simple_items_SOURCES) \
306 $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \369 $(test_glib_submenu_client_SOURCES) \
307 $(test_gtk_reorder_server_SOURCES) \370 $(test_glib_submenu_server_SOURCES) \
308 $(test_gtk_shortcut_client_SOURCES) \371 $(test_gtk_label_client_SOURCES) \
309 $(test_gtk_shortcut_server_SOURCES)372 $(test_gtk_label_server_SOURCES) $(test_gtk_objects_SOURCES) \
310am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;373 $(test_gtk_reorder_server_SOURCES) \
311am__vpath_adj = case $$p in \374 $(test_gtk_shortcut_client_SOURCES) \
312 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \375 $(test_gtk_shortcut_server_SOURCES) \
313 *) f=$$p;; \376 $(test_json_client_SOURCES) $(test_json_server_SOURCES)
314 esac;377DATA = $(examples_DATA) $(json_DATA) $(pkgconfig_DATA)
315am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;378HEADERS = $(libdbusmenu_jsonloaderinclude_HEADERS)
316am__install_max = 40
317am__nobase_strip_setup = \
318 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
319am__nobase_strip = \
320 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
321am__nobase_list = $(am__nobase_strip_setup); \
322 for p in $$list; do echo "$$p $$p"; done | \
323 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
324 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
325 if (++n[$$2] == $(am__install_max)) \
326 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
327 END { for (dir in files) print dir, files[dir] }'
328am__base_list = \
329 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
330 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
331am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)"
332DATA = $(examples_DATA) $(json_DATA)
333ETAGS = etags379ETAGS = etags
334CTAGS = ctags380CTAGS = ctags
335am__tty_colors = \381am__tty_colors = \
@@ -499,9 +545,45 @@
499top_builddir = @top_builddir@545top_builddir = @top_builddir@
500top_srcdir = @top_srcdir@546top_srcdir = @top_srcdir@
501DBUS_RUNNER = dbus-test-runner547DBUS_RUNNER = dbus-test-runner
548CLEANFILES = test-json-01.output.json \
549 dbusmenu-gtk/mago_tests/dbusmenu.pyc
502XVFB_RUN = ". $(srcdir)/run-xvfb.sh"550XVFB_RUN = ". $(srcdir)/run-xvfb.sh"
503551
504######################552######################
553# JSON Loader lib
554######################
555lib_LTLIBRARIES = libdbusmenu-jsonloader.la
556libdbusmenu_jsonloaderincludedir = $(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/
557libdbusmenu_jsonloaderinclude_HEADERS = \
558 json-loader.h
559
560libdbusmenu_jsonloader_la_SOURCES = \
561 json-loader.h \
562 json-loader.c
563
564libdbusmenu_jsonloader_la_LDFLAGS = \
565 -version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \
566 -no-undefined \
567 -export-symbols-regex "^[^_].*"
568
569libdbusmenu_jsonloader_la_CFLAGS = \
570 $(DBUSMENUGLIB_CFLAGS) \
571 $(DBUSMENUTESTS_CFLAGS) \
572 -I $(srcdir)/.. \
573 -Wall \
574 -Werror \
575 -DG_DISABLE_DEPRECATED \
576 -DG_LOG_DOMAIN="\"LIBDBUSMENU-JSONLOADER\""
577
578libdbusmenu_jsonloader_la_LIBADD = \
579 ../libdbusmenu-glib/libdbusmenu-glib.la \
580 $(DBUSMENUGLIB_LIBS) \
581 $(DBUSMENUTESTS_LIBS)
582
583pkgconfig_DATA = dbusmenu-jsonloader.pc
584pkgconfigdir = $(libdir)/pkgconfig
585
586######################
505# Test GLib server587# Test GLib server
506######################588######################
507glib_server_nomenu_SOURCES = \589glib_server_nomenu_SOURCES = \
@@ -539,6 +621,34 @@
539 ../libdbusmenu-glib/libdbusmenu-glib.la \621 ../libdbusmenu-glib/libdbusmenu-glib.la \
540 $(DBUSMENUGLIB_LIBS)622 $(DBUSMENUGLIB_LIBS)
541623
624test_json_server_SOURCES = \
625 test-json-server.c
626
627test_json_server_CFLAGS = \
628 -I $(srcdir)/.. \
629 -I $(srcdir) \
630 $(DBUSMENUGLIB_CFLAGS) \
631 $(DBUSMENUTESTS_CFLAGS) \
632 -Wall -Werror
633
634test_json_server_LDADD = \
635 ../libdbusmenu-glib/libdbusmenu-glib.la \
636 libdbusmenu-jsonloader.la \
637 $(DBUSMENUTESTS_LIBS) \
638 $(DBUSMENUGLIB_LIBS)
639
640test_json_client_SOURCES = \
641 test-json-client.c
642
643test_json_client_CFLAGS = \
644 -I $(srcdir)/.. \
645 $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
646
647test_json_client_LDADD = \
648 ../libdbusmenu-glib/libdbusmenu-glib.la \
649 $(DBUSMENUTESTS_LIBS) \
650 $(DBUSMENUGLIB_LIBS)
651
542test_glib_submenu_server_SOURCES = \652test_glib_submenu_server_SOURCES = \
543 test-glib-submenu.h \653 test-glib-submenu.h \
544 test-glib-submenu-server.c654 test-glib-submenu-server.c
@@ -687,6 +797,7 @@
687test_gtk_label_server_LDADD = \797test_gtk_label_server_LDADD = \
688 ../libdbusmenu-glib/libdbusmenu-glib.la \798 ../libdbusmenu-glib/libdbusmenu-glib.la \
689 ../libdbusmenu-gtk/libdbusmenu-gtk.la \799 ../libdbusmenu-gtk/libdbusmenu-gtk.la \
800 libdbusmenu-jsonloader.la \
690 $(DBUSMENUGTK_LIBS) \801 $(DBUSMENUGTK_LIBS) \
691 $(DBUSMENUTESTS_LIBS)802 $(DBUSMENUTESTS_LIBS)
692803
@@ -785,10 +896,8 @@
785 dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \896 dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \
786 dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \897 dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \
787 dbusmenu-gtk/mago_tests/data/static.json \898 dbusmenu-gtk/mago_tests/data/static.json \
788 dbusmenu-gtk/mago_tests/data/test-gtk-label.json899 dbusmenu-gtk/mago_tests/data/test-gtk-label.json \
789900 test-json-01.json
790CLEANFILES = \
791 dbusmenu-gtk/mago_tests/dbusmenu.pyc
792901
793DISTCLEANFILES = \902DISTCLEANFILES = \
794 $(TESTS) \903 $(TESTS) \
@@ -829,6 +938,41 @@
829$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)938$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
830 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh939 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
831$(am__aclocal_m4_deps):940$(am__aclocal_m4_deps):
941dbusmenu-jsonloader.pc: $(top_builddir)/config.status $(srcdir)/dbusmenu-jsonloader.pc.in
942 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
943install-libLTLIBRARIES: $(lib_LTLIBRARIES)
944 @$(NORMAL_INSTALL)
945 test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
946 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
947 list2=; for p in $$list; do \
948 if test -f $$p; then \
949 list2="$$list2 $$p"; \
950 else :; fi; \
951 done; \
952 test -z "$$list2" || { \
953 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
954 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
955 }
956
957uninstall-libLTLIBRARIES:
958 @$(NORMAL_UNINSTALL)
959 @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
960 for p in $$list; do \
961 $(am__strip_dir) \
962 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
963 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
964 done
965
966clean-libLTLIBRARIES:
967 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
968 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
969 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
970 test "$$dir" != "$$p" || dir=.; \
971 echo "rm -f \"$${dir}/so_locations\""; \
972 rm -f "$${dir}/so_locations"; \
973 done
974libdbusmenu-jsonloader.la: $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_DEPENDENCIES)
975 $(AM_V_CCLD)$(libdbusmenu_jsonloader_la_LINK) -rpath $(libdir) $(libdbusmenu_jsonloader_la_OBJECTS) $(libdbusmenu_jsonloader_la_LIBADD) $(LIBS)
832976
833clean-checkPROGRAMS:977clean-checkPROGRAMS:
834 @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \978 @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -892,6 +1036,12 @@
892test-gtk-shortcut-server$(EXEEXT): $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_DEPENDENCIES) 1036test-gtk-shortcut-server$(EXEEXT): $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_DEPENDENCIES)
893 @rm -f test-gtk-shortcut-server$(EXEEXT)1037 @rm -f test-gtk-shortcut-server$(EXEEXT)
894 $(AM_V_CCLD)$(test_gtk_shortcut_server_LINK) $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_LDADD) $(LIBS)1038 $(AM_V_CCLD)$(test_gtk_shortcut_server_LINK) $(test_gtk_shortcut_server_OBJECTS) $(test_gtk_shortcut_server_LDADD) $(LIBS)
1039test-json-client$(EXEEXT): $(test_json_client_OBJECTS) $(test_json_client_DEPENDENCIES)
1040 @rm -f test-json-client$(EXEEXT)
1041 $(AM_V_CCLD)$(test_json_client_LINK) $(test_json_client_OBJECTS) $(test_json_client_LDADD) $(LIBS)
1042test-json-server$(EXEEXT): $(test_json_server_OBJECTS) $(test_json_server_DEPENDENCIES)
1043 @rm -f test-json-server$(EXEEXT)
1044 $(AM_V_CCLD)$(test_json_server_LINK) $(test_json_server_OBJECTS) $(test_json_server_LDADD) $(LIBS)
8951045
896mostlyclean-compile:1046mostlyclean-compile:
897 -rm -f *.$(OBJEXT)1047 -rm -f *.$(OBJEXT)
@@ -900,6 +1050,7 @@
900 -rm -f *.tab.c1050 -rm -f *.tab.c
9011051
902@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@1052@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@
1053@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@
903@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@1054@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@
904@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@1055@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@
905@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@1056@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@
@@ -917,6 +1068,8 @@
917@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@1068@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@
918@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_client-test-gtk-shortcut-client.Po@am__quote@1069@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_client-test-gtk-shortcut-client.Po@am__quote@
919@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_server-test-gtk-shortcut-server.Po@am__quote@1070@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_shortcut_server-test-gtk-shortcut-server.Po@am__quote@
1071@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_client-test-json-client.Po@am__quote@
1072@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_json_server-test-json-server.Po@am__quote@
9201073
921.c.o:1074.c.o:
922@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<1075@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -942,6 +1095,14 @@
942@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1095@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
943@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<1096@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
9441097
1098libdbusmenu_jsonloader_la-json-loader.lo: json-loader.c
1099@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -MT libdbusmenu_jsonloader_la-json-loader.lo -MD -MP -MF $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c
1100@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Tpo $(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo
1101@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1102@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='json-loader.c' object='libdbusmenu_jsonloader_la-json-loader.lo' libtool=yes @AMDEPBACKSLASH@
1103@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1104@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbusmenu_jsonloader_la_CFLAGS) $(CFLAGS) -c -o libdbusmenu_jsonloader_la-json-loader.lo `test -f 'json-loader.c' || echo '$(srcdir)/'`json-loader.c
1105
945glib_server_nomenu-glib-server-nomenu.o: glib-server-nomenu.c1106glib_server_nomenu-glib-server-nomenu.o: glib-server-nomenu.c
946@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -MT glib_server_nomenu-glib-server-nomenu.o -MD -MP -MF $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo -c -o glib_server_nomenu-glib-server-nomenu.o `test -f 'glib-server-nomenu.c' || echo '$(srcdir)/'`glib-server-nomenu.c1107@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -MT glib_server_nomenu-glib-server-nomenu.o -MD -MP -MF $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo -c -o glib_server_nomenu-glib-server-nomenu.o `test -f 'glib-server-nomenu.c' || echo '$(srcdir)/'`glib-server-nomenu.c
947@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po1108@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Tpo $(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po
@@ -1230,6 +1391,38 @@
1230@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@1391@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1231@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) -c -o test_gtk_shortcut_server-test-gtk-shortcut-server.obj `if test -f 'test-gtk-shortcut-server.c'; then $(CYGPATH_W) 'test-gtk-shortcut-server.c'; else $(CYGPATH_W) '$(srcdir)/test-gtk-shortcut-server.c'; fi`1392@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_shortcut_server_CFLAGS) $(CFLAGS) -c -o test_gtk_shortcut_server-test-gtk-shortcut-server.obj `if test -f 'test-gtk-shortcut-server.c'; then $(CYGPATH_W) 'test-gtk-shortcut-server.c'; else $(CYGPATH_W) '$(srcdir)/test-gtk-shortcut-server.c'; fi`
12321393
1394test_json_client-test-json-client.o: test-json-client.c
1395@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.o -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c
1396@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po
1397@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1398@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-client.c' object='test_json_client-test-json-client.o' libtool=no @AMDEPBACKSLASH@
1399@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1400@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.o `test -f 'test-json-client.c' || echo '$(srcdir)/'`test-json-client.c
1401
1402test_json_client-test-json-client.obj: test-json-client.c
1403@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -MT test_json_client-test-json-client.obj -MD -MP -MF $(DEPDIR)/test_json_client-test-json-client.Tpo -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi`
1404@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_client-test-json-client.Tpo $(DEPDIR)/test_json_client-test-json-client.Po
1405@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1406@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-client.c' object='test_json_client-test-json-client.obj' libtool=no @AMDEPBACKSLASH@
1407@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1408@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_client_CFLAGS) $(CFLAGS) -c -o test_json_client-test-json-client.obj `if test -f 'test-json-client.c'; then $(CYGPATH_W) 'test-json-client.c'; else $(CYGPATH_W) '$(srcdir)/test-json-client.c'; fi`
1409
1410test_json_server-test-json-server.o: test-json-server.c
1411@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.o -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c
1412@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po
1413@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1414@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-server.c' object='test_json_server-test-json-server.o' libtool=no @AMDEPBACKSLASH@
1415@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1416@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.o `test -f 'test-json-server.c' || echo '$(srcdir)/'`test-json-server.c
1417
1418test_json_server-test-json-server.obj: test-json-server.c
1419@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -MT test_json_server-test-json-server.obj -MD -MP -MF $(DEPDIR)/test_json_server-test-json-server.Tpo -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi`
1420@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_json_server-test-json-server.Tpo $(DEPDIR)/test_json_server-test-json-server.Po
1421@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
1422@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-json-server.c' object='test_json_server-test-json-server.obj' libtool=no @AMDEPBACKSLASH@
1423@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1424@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_json_server_CFLAGS) $(CFLAGS) -c -o test_json_server-test-json-server.obj `if test -f 'test-json-server.c'; then $(CYGPATH_W) 'test-json-server.c'; else $(CYGPATH_W) '$(srcdir)/test-json-server.c'; fi`
1425
1233mostlyclean-libtool:1426mostlyclean-libtool:
1234 -rm -f *.lo1427 -rm -f *.lo
12351428
@@ -1275,6 +1468,46 @@
1275 test -n "$$files" || exit 0; \1468 test -n "$$files" || exit 0; \
1276 echo " ( cd '$(DESTDIR)$(jsondir)' && rm -f" $$files ")"; \1469 echo " ( cd '$(DESTDIR)$(jsondir)' && rm -f" $$files ")"; \
1277 cd "$(DESTDIR)$(jsondir)" && rm -f $$files1470 cd "$(DESTDIR)$(jsondir)" && rm -f $$files
1471install-pkgconfigDATA: $(pkgconfig_DATA)
1472 @$(NORMAL_INSTALL)
1473 test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
1474 @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1475 for p in $$list; do \
1476 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1477 echo "$$d$$p"; \
1478 done | $(am__base_list) | \
1479 while read files; do \
1480 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
1481 $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
1482 done
1483
1484uninstall-pkgconfigDATA:
1485 @$(NORMAL_UNINSTALL)
1486 @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1487 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1488 test -n "$$files" || exit 0; \
1489 echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
1490 cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
1491install-libdbusmenu_jsonloaderincludeHEADERS: $(libdbusmenu_jsonloaderinclude_HEADERS)
1492 @$(NORMAL_INSTALL)
1493 test -z "$(libdbusmenu_jsonloaderincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"
1494 @list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \
1495 for p in $$list; do \
1496 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1497 echo "$$d$$p"; \
1498 done | $(am__base_list) | \
1499 while read files; do \
1500 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)'"; \
1501 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" || exit $$?; \
1502 done
1503
1504uninstall-libdbusmenu_jsonloaderincludeHEADERS:
1505 @$(NORMAL_UNINSTALL)
1506 @list='$(libdbusmenu_jsonloaderinclude_HEADERS)'; test -n "$(libdbusmenu_jsonloaderincludedir)" || list=; \
1507 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1508 test -n "$$files" || exit 0; \
1509 echo " ( cd '$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)' && rm -f" $$files ")"; \
1510 cd "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)" && rm -f $$files
12781511
1279ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)1512ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1280 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \1513 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1454,9 +1687,9 @@
1454 $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)1687 $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
1455 $(MAKE) $(AM_MAKEFLAGS) check-TESTS1688 $(MAKE) $(AM_MAKEFLAGS) check-TESTS
1456check: check-am1689check: check-am
1457all-am: Makefile $(DATA)1690all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
1458installdirs:1691installdirs:
1459 for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)"; do \1692 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libdbusmenu_jsonloaderincludedir)"; do \
1460 test -z "$$dir" || $(MKDIR_P) "$$dir"; \1693 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1461 done1694 done
1462install: install-am1695install: install-am
@@ -1488,8 +1721,8 @@
1488 @echo "it deletes files that may require special tools to rebuild."1721 @echo "it deletes files that may require special tools to rebuild."
1489clean: clean-am1722clean: clean-am
14901723
1491clean-am: clean-checkPROGRAMS clean-generic clean-libtool \1724clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
1492 mostlyclean-am1725 clean-libtool mostlyclean-am
14931726
1494distclean: distclean-am1727distclean: distclean-am
1495 -rm -rf ./$(DEPDIR)1728 -rm -rf ./$(DEPDIR)
@@ -1509,13 +1742,15 @@
15091742
1510info-am:1743info-am:
15111744
1512install-data-am: install-examplesDATA install-jsonDATA1745install-data-am: install-examplesDATA install-jsonDATA \
1746 install-libdbusmenu_jsonloaderincludeHEADERS \
1747 install-pkgconfigDATA
15131748
1514install-dvi: install-dvi-am1749install-dvi: install-dvi-am
15151750
1516install-dvi-am:1751install-dvi-am:
15171752
1518install-exec-am:1753install-exec-am: install-libLTLIBRARIES
15191754
1520install-html: install-html-am1755install-html: install-html-am
15211756
@@ -1555,24 +1790,32 @@
15551790
1556ps-am:1791ps-am:
15571792
1558uninstall-am: uninstall-examplesDATA uninstall-jsonDATA1793uninstall-am: uninstall-examplesDATA uninstall-jsonDATA \
1794 uninstall-libLTLIBRARIES \
1795 uninstall-libdbusmenu_jsonloaderincludeHEADERS \
1796 uninstall-pkgconfigDATA
15591797
1560.MAKE: check-am install-am install-strip1798.MAKE: check-am install-am install-strip
15611799
1562.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \1800.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
1563 clean-checkPROGRAMS clean-generic clean-libtool ctags \1801 clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
1564 distclean distclean-compile distclean-generic \1802 clean-libtool ctags distclean distclean-compile \
1565 distclean-libtool distclean-local distclean-tags distdir dvi \1803 distclean-generic distclean-libtool distclean-local \
1566 dvi-am html html-am info info-am install install-am \1804 distclean-tags distdir dvi dvi-am html html-am info info-am \
1567 install-data install-data-am install-dvi install-dvi-am \1805 install install-am install-data install-data-am install-dvi \
1568 install-examplesDATA install-exec install-exec-am install-html \1806 install-dvi-am install-examplesDATA install-exec \
1569 install-html-am install-info install-info-am install-jsonDATA \1807 install-exec-am install-html install-html-am install-info \
1570 install-man install-pdf install-pdf-am install-ps \1808 install-info-am install-jsonDATA install-libLTLIBRARIES \
1809 install-libdbusmenu_jsonloaderincludeHEADERS install-man \
1810 install-pdf install-pdf-am install-pkgconfigDATA install-ps \
1571 install-ps-am install-strip installcheck installcheck-am \1811 install-ps-am install-strip installcheck installcheck-am \
1572 installdirs maintainer-clean maintainer-clean-generic \1812 installdirs maintainer-clean maintainer-clean-generic \
1573 mostlyclean mostlyclean-compile mostlyclean-generic \1813 mostlyclean mostlyclean-compile mostlyclean-generic \
1574 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \1814 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
1575 uninstall-am uninstall-examplesDATA uninstall-jsonDATA1815 uninstall-am uninstall-examplesDATA uninstall-jsonDATA \
1816 uninstall-libLTLIBRARIES \
1817 uninstall-libdbusmenu_jsonloaderincludeHEADERS \
1818 uninstall-pkgconfigDATA
15761819
15771820
1578######################1821######################
@@ -1585,6 +1828,17 @@
1585 @chmod +x $@1828 @chmod +x $@
15861829
1587######################1830######################
1831# Test JSON
1832######################
1833
1834test-json: test-json-client test-json-server Makefile.am
1835 @echo "#!/bin/bash" > $@
1836 @echo $(XVFB_RUN) >> $@
1837 @echo $(DBUS_RUNNER) --task ./test-json-client --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@
1838 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
1839 @chmod +x $@
1840
1841######################
1588# Test Glib Submenu1842# Test Glib Submenu
1589######################1843######################
15901844
15911845
=== added file 'tests/dbusmenu-jsonloader.pc.in'
--- tests/dbusmenu-jsonloader.pc.in 1970-01-01 00:00:00 +0000
+++ tests/dbusmenu-jsonloader.pc.in 2010-07-01 14:04:28 +0000
@@ -0,0 +1,14 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4bindir=@bindir@
5includedir=@includedir@
6
7Cflags: -I${includedir}/libdbusmenu-0.1
8Requires: dbus-glib-1,dbusmenu-glib,json-glib-1.0
9Libs: -L${libdir} -ldbusmenu-jsonloader
10
11Name: libdbusmenu-jsonloader
12Description: A small library to load JSON descriptions of menus. Mostly for testing.
13Version: @VERSION@
14
015
=== added file 'tests/json-loader.c'
--- tests/json-loader.c 1970-01-01 00:00:00 +0000
+++ tests/json-loader.c 2010-07-01 14:04:28 +0000
@@ -0,0 +1,220 @@
1/*
2A loader to turn JSON into dbusmenu menuitems
3
4Copyright 2010 Canonical Ltd.
5
6Authors:
7 Ted Gould <ted@canonical.com>
8
9This program is free software: you can redistribute it and/or modify it
10under the terms of the GNU General Public License version 3, as published
11by the Free Software Foundation.
12
13This program is distributed in the hope that it will be useful, but
14WITHOUT ANY WARRANTY; without even the implied warranties of
15MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16PURPOSE. See the GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License along
19with this program. If not, see <http://www.gnu.org/licenses/>.
20*/
21
22#include "json-loader.h"
23#include <dbus/dbus-gtype-specialized.h>
24
25static GValue *
26node2value (JsonNode * node)
27{
28 if (node == NULL) {
29 return NULL;
30 }
31
32 GValue * value = g_new0(GValue, 1);
33
34 if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE) {
35 json_node_get_value(node, value);
36 return value;
37 }
38
39 if (JSON_NODE_TYPE(node) == JSON_NODE_ARRAY) {
40 JsonArray * array = json_node_get_array(node);
41 JsonNode * first = json_array_get_element(array, 0);
42
43 if (JSON_NODE_TYPE(first) == JSON_NODE_VALUE) {
44 GValue subvalue = {0};
45 json_node_get_value(first, &subvalue);
46
47 if (G_VALUE_TYPE(&subvalue) == G_TYPE_STRING) {
48 GArray * garray = g_array_sized_new(TRUE, TRUE, sizeof(gchar *), json_array_get_length(array));
49 g_value_init(value, G_TYPE_STRV);
50 g_value_take_boxed(value, garray->data);
51
52 int i;
53 for (i = 0; i < json_array_get_length(array); i++) {
54 const gchar * str = json_node_get_string(json_array_get_element(array, i));
55 gchar * dupstr = g_strdup(str);
56 g_array_append_val(garray, dupstr);
57 }
58
59 g_array_free(garray, FALSE);
60 } else {
61 GValueArray * varray = g_value_array_new(json_array_get_length(array));
62 g_value_init(value, G_TYPE_VALUE_ARRAY);
63 g_value_take_boxed(value, varray);
64
65 g_value_array_append(varray, &subvalue);
66 g_value_unset(&subvalue);
67
68 int i;
69 for (i = 1; i < json_array_get_length(array); i++) {
70 json_node_get_value(first, &subvalue);
71 g_value_array_append(varray, &subvalue);
72 g_value_unset(&subvalue);
73 }
74 }
75
76 } else {
77 GValue * subvalue = node2value(first);
78 GType type = dbus_g_type_get_collection("GPtrArray", G_VALUE_TYPE(subvalue));
79 gpointer * wrapper = dbus_g_type_specialized_construct(type);
80
81 g_value_init(value, type);
82 g_value_take_boxed(value, wrapper);
83
84 DBusGTypeSpecializedAppendContext ctx;
85 dbus_g_type_specialized_init_append(value, &ctx);
86
87 dbus_g_type_specialized_collection_append(&ctx, subvalue);
88 int i;
89 for (i = 1; i < json_array_get_length(array); i++) {
90 GValue * subvalue = node2value(node);
91 dbus_g_type_specialized_collection_append(&ctx, subvalue);
92 }
93
94 dbus_g_type_specialized_collection_end_append(&ctx);
95 }
96 }
97
98 if (JSON_NODE_TYPE(node) == JSON_NODE_OBJECT) {
99 JsonObject * obj = json_node_get_object(node);
100
101 GType type = dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
102 GHashTable * hash = (GHashTable *)dbus_g_type_specialized_construct(type);
103
104 g_value_init(value, type);
105 g_value_take_boxed(value, hash);
106
107 DBusGTypeSpecializedAppendContext ctx;
108 dbus_g_type_specialized_init_append(value, &ctx);
109
110 GList * members = NULL;
111 for (members = json_object_get_members(obj); members != NULL; members = g_list_next(members)) {
112 const gchar * member = members->data;
113
114 JsonNode * lnode = json_object_get_member(obj, member);
115 GValue * value = node2value(lnode);
116
117 if (value != NULL) {
118 GValue name = {0};
119 g_value_init(&name, G_TYPE_STRING);
120 g_value_set_static_string(&name, member);
121
122 dbus_g_type_specialized_map_append(&ctx, &name, value);
123
124 g_value_unset(&name);
125 g_value_unset(value);
126 g_free(value);
127 }
128 }
129 }
130
131 return value;
132}
133
134static void
135set_props (DbusmenuMenuitem * mi, JsonObject * node)
136{
137 if (node == NULL) return;
138
139 GList * members = NULL;
140 for (members = json_object_get_members(node); members != NULL; members = g_list_next(members)) {
141 const gchar * member = members->data;
142
143 if (!g_strcmp0(member, "id")) { continue; }
144 if (!g_strcmp0(member, "submenu")) { continue; }
145
146 JsonNode * lnode = json_object_get_member(node, member);
147 GValue * value = node2value(lnode);
148
149 if (value != NULL) {
150 dbusmenu_menuitem_property_set_value(mi, member, value);
151 g_value_unset(value);
152 g_free(value);
153 }
154 }
155
156 return;
157}
158
159DbusmenuMenuitem *
160dbusmenu_json_build_from_node (const JsonNode * cnode)
161{
162 JsonNode * node = (JsonNode *)cnode; /* To match the jsonglib API :( */
163
164 if (node == NULL) return NULL;
165 if (JSON_NODE_TYPE(node) != JSON_NODE_OBJECT) return NULL;
166
167 JsonObject * layout = json_node_get_object(node);
168
169 DbusmenuMenuitem * local = NULL;
170 if (json_object_has_member(layout, "id")) {
171 JsonNode * node = json_object_get_member(layout, "id");
172 g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE, NULL);
173 local = dbusmenu_menuitem_new_with_id(json_node_get_int(node));
174 } else {
175 local = dbusmenu_menuitem_new();
176 }
177
178 set_props(local, layout);
179
180 if (json_object_has_member(layout, "submenu")) {
181 JsonNode * node = json_object_get_member(layout, "submenu");
182 g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_ARRAY, local);
183 JsonArray * array = json_node_get_array(node);
184 guint count;
185 for (count = 0; count < json_array_get_length(array); count++) {
186 DbusmenuMenuitem * child = dbusmenu_json_build_from_node(json_array_get_element(array, count));
187 if (child != NULL) {
188 dbusmenu_menuitem_child_append(local, child);
189 }
190 }
191 }
192
193 /* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */
194 return local;
195}
196
197DbusmenuMenuitem *
198dbusmenu_json_build_from_file (const gchar * filename)
199{
200 JsonParser * parser = json_parser_new();
201
202 GError * error = NULL;
203 if (!json_parser_load_from_file(parser, filename, &error)) {
204 g_warning("Failed parsing file %s because: %s", filename, error->message);
205 g_error_free(error);
206 return NULL;
207 }
208
209 JsonNode * root_node = json_parser_get_root(parser);
210 if (JSON_NODE_TYPE(root_node) != JSON_NODE_OBJECT) {
211 g_warning("Root node is not an object, fail. It's an: %s", json_node_type_name(root_node));
212 return NULL;
213 }
214
215 DbusmenuMenuitem * mi = dbusmenu_json_build_from_node(root_node);
216
217 g_object_unref(parser);
218
219 return mi;
220}
0221
=== added file 'tests/json-loader.h'
--- tests/json-loader.h 1970-01-01 00:00:00 +0000
+++ tests/json-loader.h 2010-07-01 14:04:28 +0000
@@ -0,0 +1,31 @@
1/*
2A loader to turn JSON into dbusmenu menuitems
3
4Copyright 2010 Canonical Ltd.
5
6Authors:
7 Ted Gould <ted@canonical.com>
8
9This program is free software: you can redistribute it and/or modify it
10under the terms of the GNU General Public License version 3, as published
11by the Free Software Foundation.
12
13This program is distributed in the hope that it will be useful, but
14WITHOUT ANY WARRANTY; without even the implied warranties of
15MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16PURPOSE. See the GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License along
19with this program. If not, see <http://www.gnu.org/licenses/>.
20*/
21
22#ifndef __DBUSMENU_JSON_LOADER_H__
23#define __DBUSMENU_JSON_LOADER_H__
24
25#include <libdbusmenu-glib/menuitem.h>
26#include <json-glib/json-glib.h>
27
28DbusmenuMenuitem * dbusmenu_json_build_from_node (const JsonNode * node);
29DbusmenuMenuitem * dbusmenu_json_build_from_file (const gchar * filename);
30
31#endif /* __DBUSMENU_JSON_LOADER_H__ */
032
=== modified file 'tests/test-gtk-label-server.c'
--- tests/test-gtk-label-server.c 2010-02-04 19:04:28 +0000
+++ tests/test-gtk-label-server.c 2010-07-01 14:04:28 +0000
@@ -30,74 +30,7 @@
30#include <libdbusmenu-glib/server.h>30#include <libdbusmenu-glib/server.h>
3131
32#include <json-glib/json-glib.h>32#include <json-glib/json-glib.h>
3333#include "json-loader.h"
34static void
35menuitem_click(DbusmenuMenuitem * mi, guint32 time, gpointer user_data)
36{
37 g_debug("Clicked on: %d @ %d", dbusmenu_menuitem_get_id(mi), time);
38 return;
39}
40
41static void
42set_props (DbusmenuMenuitem * mi, JsonObject * node)
43{
44 if (node == NULL) return;
45
46 GList * members = NULL;
47 for (members = json_object_get_members(node); members != NULL; members = g_list_next(members)) {
48 const gchar * member = members->data;
49
50 if (!g_strcmp0(member, "id")) { continue; }
51 if (!g_strcmp0(member, "submenu")) { continue; }
52
53 JsonNode * lnode = json_object_get_member(node, member);
54 if (JSON_NODE_TYPE(lnode) != JSON_NODE_VALUE) { continue; }
55
56 GValue value = {0};
57 json_node_get_value(lnode, &value);
58 dbusmenu_menuitem_property_set_value(mi, member, &value);
59 g_value_unset(&value);
60 }
61
62 return;
63}
64
65static DbusmenuMenuitem *
66layout2menuitem (JsonNode * inlayout)
67{
68 if (inlayout == NULL) return NULL;
69 if (JSON_NODE_TYPE(inlayout) != JSON_NODE_OBJECT) return NULL;
70
71 JsonObject * layout = json_node_get_object(inlayout);
72
73 DbusmenuMenuitem * local = NULL;
74 if (json_object_has_member(layout, "id")) {
75 JsonNode * node = json_object_get_member(layout, "id");
76 g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE, NULL);
77 local = dbusmenu_menuitem_new_with_id(json_node_get_int(node));
78 } else {
79 local = dbusmenu_menuitem_new();
80 }
81 g_signal_connect(G_OBJECT(local), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_click), NULL);
82
83 set_props(local, layout);
84
85 if (json_object_has_member(layout, "submenu")) {
86 JsonNode * node = json_object_get_member(layout, "submenu");
87 g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_ARRAY, local);
88 JsonArray * array = json_node_get_array(node);
89 guint count;
90 for (count = 0; count < json_array_get_length(array); count++) {
91 DbusmenuMenuitem * child = layout2menuitem(json_array_get_element(array, count));
92 if (child != NULL) {
93 dbusmenu_menuitem_child_append(local, child);
94 }
95 }
96 }
97
98 /* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */
99 return local;
100}
10134
102static JsonArray * root_array = NULL;35static JsonArray * root_array = NULL;
103static guint layouton = 0;36static guint layouton = 0;
@@ -114,7 +47,7 @@
114 }47 }
115 g_debug("Updating to Layout %d", layouton);48 g_debug("Updating to Layout %d", layouton);
11649
117 dbusmenu_server_set_root(server, layout2menuitem(json_array_get_element(root_array, layouton)));50 dbusmenu_server_set_root(server, dbusmenu_json_build_from_node(json_array_get_element(root_array, layouton)));
118 layouton++;51 layouton++;
11952
120 return TRUE;53 return TRUE;
12154
=== added file 'tests/test-json-01.json'
--- tests/test-json-01.json 1970-01-01 00:00:00 +0000
+++ tests/test-json-01.json 2010-07-01 14:04:28 +0000
@@ -0,0 +1,4023 @@
1{
2 "id": 0,
3 "children-display": "submenu",
4 "submenu": [
5 {
6 "id": 5,
7 "enabled": true,
8 "label": "File",
9 "children-display": "submenu",
10 "visible": true,
11 "submenu": [
12 {
13 "id": 6,
14 "shortcut": [["Control", "q"]],
15 "enabled": true,
16 "label": "Quit",
17 "visible": true
18 },
19 {
20 "id": 7,
21 "shortcut": [["Control", "Shift", "w"]],
22 "enabled": true,
23 "label": "Close all",
24 "visible": true
25 },
26 {
27 "id": 8,
28 "shortcut": [["Control", "w"]],
29 "enabled": true,
30 "label": "Close",
31 "visible": true
32 },
33 {
34 "id": 9,
35 "type": "separator"
36 },
37 {
38 "id": 10,
39 "enabled": true,
40 "label": "Send by Email...",
41 "visible": true
42 },
43 {
44 "id": 11,
45 "shortcut": [["Control", "p"]],
46 "enabled": true,
47 "label": "Print...",
48 "visible": true
49 },
50 {
51 "id": 12,
52 "enabled": true,
53 "label": "Page Setup",
54 "visible": true
55 },
56 {
57 "id": 13,
58 "type": "separator"
59 },
60 {
61 "id": 14,
62 "enabled": true,
63 "label": "Revert",
64 "visible": true
65 },
66 {
67 "id": 15,
68 "enabled": true,
69 "label": "Save as Template...",
70 "visible": true
71 },
72 {
73 "id": 16,
74 "enabled": true,
75 "label": "Save a Copy...",
76 "visible": true
77 },
78 {
79 "id": 17,
80 "shortcut": [["Control", "Shift", "s"]],
81 "enabled": true,
82 "label": "Save As...",
83 "visible": true
84 },
85 {
86 "id": 18,
87 "shortcut": [["Control", "s"]],
88 "enabled": true,
89 "label": "Save",
90 "visible": true
91 },
92 {
93 "id": 19,
94 "type": "separator"
95 },
96 {
97 "id": 20,
98 "enabled": true,
99 "label": "Open Recent",
100 "children-display": "submenu",
101 "visible": true,
102 "submenu": [
103 {
104 "id": 21,
105 "enabled": true,
106 "label": "Document History",
107 "visible": true
108 },
109 {
110 "id": 22,
111 "type": "separator"
112 },
113 {
114 "id": 23,
115 "shortcut": [["Control", "2"]],
116 "enabled": true,
117 "label": "giggity.jpg",
118 "visible": true
119 },
120 {
121 "id": 24,
122 "shortcut": [["Control", "1"]],
123 "enabled": true,
124 "label": "Icon Height.svg",
125 "visible": true
126 }
127 ]
128 },
129 {
130 "id": 25,
131 "enabled": true,
132 "label": "Open Location...",
133 "visible": true
134 },
135 {
136 "id": 26,
137 "shortcut": [["Control", "Alt", "o"]],
138 "enabled": true,
139 "label": "Open as Layers...",
140 "visible": true
141 },
142 {
143 "id": 27,
144 "shortcut": [["Control", "o"]],
145 "enabled": true,
146 "label": "Open...",
147 "visible": true
148 },
149 {
150 "id": 28,
151 "enabled": true,
152 "label": "Create",
153 "children-display": "submenu",
154 "visible": true,
155 "submenu": [
156 {
157 "id": 29,
158 "enabled": true,
159 "label": "Web Page Themes",
160 "children-display": "submenu",
161 "visible": true,
162 "submenu": [
163 {
164 "id": 30,
165 "enabled": true,
166 "label": "Classic.Gimp.Org",
167 "children-display": "submenu",
168 "visible": true,
169 "submenu": [
170 {
171 "id": 31,
172 "enabled": true,
173 "label": "Tube Sub-Sub-Button Label...",
174 "visible": true
175 },
176 {
177 "id": 32,
178 "enabled": true,
179 "label": "Tube Sub-Button Label...",
180 "visible": true
181 },
182 {
183 "id": 33,
184 "enabled": true,
185 "label": "Tube Button Label...",
186 "visible": true
187 },
188 {
189 "id": 34,
190 "enabled": true,
191 "label": "Small Header...",
192 "visible": true
193 },
194 {
195 "id": 35,
196 "enabled": true,
197 "label": "General Tube Labels...",
198 "visible": true
199 },
200 {
201 "id": 36,
202 "enabled": true,
203 "label": "Big Header...",
204 "visible": true
205 }
206 ]
207 },
208 {
209 "id": 37,
210 "enabled": true,
211 "label": "Beveled Pattern",
212 "children-display": "submenu",
213 "visible": true,
214 "submenu": [
215 {
216 "id": 38,
217 "enabled": true,
218 "label": "Hrule...",
219 "visible": true
220 },
221 {
222 "id": 39,
223 "enabled": true,
224 "label": "Heading...",
225 "visible": true
226 },
227 {
228 "id": 40,
229 "enabled": true,
230 "label": "Button...",
231 "visible": true
232 },
233 {
234 "id": 41,
235 "enabled": true,
236 "label": "Bullet...",
237 "visible": true
238 },
239 {
240 "id": 42,
241 "enabled": true,
242 "label": "Arrow...",
243 "visible": true
244 }
245 ]
246 },
247 {
248 "id": 43,
249 "enabled": true,
250 "label": "Alien Glow",
251 "children-display": "submenu",
252 "visible": true,
253 "submenu": [
254 {
255 "id": 44,
256 "enabled": true,
257 "label": "Hrule...",
258 "visible": true
259 },
260 {
261 "id": 45,
262 "enabled": true,
263 "label": "Button...",
264 "visible": true
265 },
266 {
267 "id": 46,
268 "enabled": true,
269 "label": "Bullet...",
270 "visible": true
271 },
272 {
273 "id": 47,
274 "enabled": true,
275 "label": "Arrow...",
276 "visible": true
277 }
278 ]
279 }
280 ]
281 },
282 {
283 "id": 48,
284 "enabled": true,
285 "label": "Patterns",
286 "children-display": "submenu",
287 "visible": true,
288 "submenu": [
289 {
290 "id": 49,
291 "enabled": true,
292 "label": "Truchet...",
293 "visible": true
294 },
295 {
296 "id": 50,
297 "enabled": true,
298 "label": "Swirly...",
299 "visible": true
300 },
301 {
302 "id": 51,
303 "enabled": true,
304 "label": "Swirl-Tile...",
305 "visible": true
306 },
307 {
308 "id": 52,
309 "enabled": true,
310 "label": "Render Map...",
311 "visible": true
312 },
313 {
314 "id": 53,
315 "enabled": true,
316 "label": "Land...",
317 "visible": true
318 },
319 {
320 "id": 54,
321 "enabled": true,
322 "label": "Flatland...",
323 "visible": true
324 },
325 {
326 "id": 55,
327 "enabled": true,
328 "label": "Camouflage...",
329 "visible": true
330 },
331 {
332 "id": 56,
333 "enabled": true,
334 "label": "3D Truchet...",
335 "visible": true
336 }
337 ]
338 },
339 {
340 "id": 57,
341 "enabled": true,
342 "label": "Logos",
343 "children-display": "submenu",
344 "visible": true,
345 "submenu": [
346 {
347 "id": 58,
348 "enabled": true,
349 "label": "Web Title Header...",
350 "visible": true
351 },
352 {
353 "id": 59,
354 "enabled": true,
355 "label": "Textured...",
356 "visible": true
357 },
358 {
359 "id": 60,
360 "enabled": true,
361 "label": "Text Circle...",
362 "visible": true
363 },
364 {
365 "id": 61,
366 "enabled": true,
367 "label": "Starscape...",
368 "visible": true
369 },
370 {
371 "id": 62,
372 "enabled": true,
373 "label": "Speed Text...",
374 "visible": true
375 },
376 {
377 "id": 63,
378 "enabled": true,
379 "label": "SOTA Chrome...",
380 "visible": true
381 },
382 {
383 "id": 64,
384 "enabled": true,
385 "label": "Particle Trace...",
386 "visible": true
387 },
388 {
389 "id": 65,
390 "enabled": true,
391 "label": "Newsprint Text...",
392 "visible": true
393 },
394 {
395 "id": 66,
396 "enabled": true,
397 "label": "Neon...",
398 "visible": true
399 },
400 {
401 "id": 67,
402 "enabled": true,
403 "label": "Imigre-26...",
404 "visible": true
405 },
406 {
407 "id": 68,
408 "enabled": true,
409 "label": "Gradient Bevel...",
410 "visible": true
411 },
412 {
413 "id": 69,
414 "enabled": true,
415 "label": "Glowing Hot...",
416 "visible": true
417 },
418 {
419 "id": 70,
420 "enabled": true,
421 "label": "Glossy...",
422 "visible": true
423 },
424 {
425 "id": 71,
426 "enabled": true,
427 "label": "Frosty...",
428 "visible": true
429 },
430 {
431 "id": 72,
432 "enabled": true,
433 "label": "Crystal...",
434 "visible": true
435 },
436 {
437 "id": 73,
438 "enabled": true,
439 "label": "Cool Metal...",
440 "visible": true
441 },
442 {
443 "id": 74,
444 "enabled": true,
445 "label": "Comic Book...",
446 "visible": true
447 },
448 {
449 "id": 75,
450 "enabled": true,
451 "label": "Chrome...",
452 "visible": true
453 },
454 {
455 "id": 76,
456 "enabled": true,
457 "label": "Chip Away...",
458 "visible": true
459 },
460 {
461 "id": 77,
462 "enabled": true,
463 "label": "Chalk...",
464 "visible": true
465 },
466 {
467 "id": 78,
468 "enabled": true,
469 "label": "Carved...",
470 "visible": true
471 },
472 {
473 "id": 79,
474 "enabled": true,
475 "label": "Bovination...",
476 "visible": true
477 },
478 {
479 "id": 80,
480 "enabled": true,
481 "label": "Blended...",
482 "visible": true
483 },
484 {
485 "id": 81,
486 "enabled": true,
487 "label": "Basic I...",
488 "visible": true
489 },
490 {
491 "id": 82,
492 "enabled": true,
493 "label": "Basic II...",
494 "visible": true
495 },
496 {
497 "id": 83,
498 "enabled": true,
499 "label": "Alien Neon...",
500 "visible": true
501 },
502 {
503 "id": 84,
504 "enabled": true,
505 "label": "Alien Glow...",
506 "visible": true
507 },
508 {
509 "id": 85,
510 "enabled": true,
511 "label": "3D Outline...",
512 "visible": true
513 }
514 ]
515 },
516 {
517 "id": 86,
518 "enabled": true,
519 "label": "Buttons",
520 "children-display": "submenu",
521 "visible": true,
522 "submenu": [
523 {
524 "id": 87,
525 "enabled": true,
526 "label": "Simple Beveled Button...",
527 "visible": true
528 },
529 {
530 "id": 88,
531 "enabled": true,
532 "label": "Round Button...",
533 "visible": true
534 }
535 ]
536 },
537 {
538 "id": 89,
539 "type": "separator"
540 },
541 {
542 "id": 90,
543 "enabled": true,
544 "label": "xscanimage",
545 "children-display": "submenu",
546 "visible": true,
547 "submenu": [
548 {
549 "id": 91,
550 "enabled": false,
551 "label": "Device dialog...",
552 "visible": true
553 }
554 ]
555 },
556 {
557 "id": 92,
558 "enabled": true,
559 "label": "Screenshot...",
560 "visible": true
561 },
562 {
563 "id": 93,
564 "shortcut": [["Control", "Shift", "v"]],
565 "enabled": true,
566 "label": "From Clipboard",
567 "visible": true
568 }
569 ]
570 },
571 {
572 "id": 94,
573 "shortcut": [["Control", "n"]],
574 "enabled": true,
575 "label": "New...",
576 "visible": true
577 }
578 ]
579 },
580 {
581 "id": 95,
582 "enabled": true,
583 "label": "Edit",
584 "children-display": "submenu",
585 "visible": true,
586 "submenu": [
587 {
588 "id": 96,
589 "enabled": true,
590 "label": "Units",
591 "visible": true
592 },
593 {
594 "id": 97,
595 "enabled": true,
596 "label": "Modules",
597 "visible": true
598 },
599 {
600 "id": 98,
601 "enabled": true,
602 "label": "Keyboard Shortcuts",
603 "visible": true
604 },
605 {
606 "id": 99,
607 "enabled": true,
608 "label": "Preferences",
609 "visible": true
610 },
611 {
612 "id": 100,
613 "type": "separator"
614 },
615 {
616 "id": 101,
617 "enabled": false,
618 "label": "Stroke Path...",
619 "visible": true
620 },
621 {
622 "id": 102,
623 "enabled": false,
624 "label": "Stroke Selection...",
625 "visible": true
626 },
627 {
628 "id": 103,
629 "shortcut": [["Control", "semicolon"]],
630 "enabled": true,
631 "label": "Fill with Pattern",
632 "visible": true
633 },
634 {
635 "id": 104,
636 "shortcut": [["Control", "period"]],
637 "enabled": true,
638 "label": "Fill with BG Color",
639 "visible": true
640 },
641 {
642 "id": 105,
643 "shortcut": [["Control", "comma"]],
644 "enabled": true,
645 "label": "Fill with FG Color",
646 "visible": true
647 },
648 {
649 "id": 106,
650 "shortcut": [["Delete"]],
651 "enabled": true,
652 "label": "Clear",
653 "visible": true
654 },
655 {
656 "id": 107,
657 "type": "separator"
658 },
659 {
660 "id": 108,
661 "enabled": true,
662 "label": "Buffer",
663 "children-display": "submenu",
664 "visible": true,
665 "submenu": [
666 {
667 "id": 109,
668 "enabled": true,
669 "label": "Paste Named...",
670 "visible": true
671 },
672 {
673 "id": 110,
674 "enabled": true,
675 "label": "Copy Visible Named...",
676 "visible": true
677 },
678 {
679 "id": 111,
680 "enabled": true,
681 "label": "Copy Named...",
682 "visible": true
683 },
684 {
685 "id": 112,
686 "enabled": true,
687 "label": "Cut Named...",
688 "visible": true
689 }
690 ]
691 },
692 {
693 "id": 113,
694 "enabled": true,
695 "label": "Paste as",
696 "children-display": "submenu",
697 "visible": true,
698 "submenu": [
699 {
700 "id": 114,
701 "enabled": true,
702 "label": "New Pattern...",
703 "visible": true
704 },
705 {
706 "id": 115,
707 "enabled": true,
708 "label": "New Brush...",
709 "visible": true
710 },
711 {
712 "id": 116,
713 "enabled": true,
714 "label": "New Layer",
715 "visible": true
716 },
717 {
718 "id": 117,
719 "shortcut": [["Control", "Shift", "v"]],
720 "enabled": true,
721 "label": "New Image",
722 "visible": true
723 }
724 ]
725 },
726 {
727 "id": 118,
728 "enabled": true,
729 "label": "Paste Into",
730 "visible": true
731 },
732 {
733 "id": 119,
734 "shortcut": [["Control", "v"]],
735 "enabled": true,
736 "label": "Paste",
737 "visible": true
738 },
739 {
740 "id": 120,
741 "shortcut": [["Control", "Shift", "c"]],
742 "enabled": true,
743 "label": "Copy Visible",
744 "visible": true
745 },
746 {
747 "id": 121,
748 "shortcut": [["Control", "c"]],
749 "enabled": true,
750 "label": "Copy",
751 "visible": true
752 },
753 {
754 "id": 122,
755 "shortcut": [["Control", "x"]],
756 "enabled": true,
757 "label": "Cut",
758 "visible": true
759 },
760 {
761 "id": 123,
762 "type": "separator"
763 },
764 {
765 "id": 124,
766 "enabled": true,
767 "label": "Undo History",
768 "visible": true
769 },
770 {
771 "id": 3,
772 "enabled": false,
773 "label": "_Fade...",
774 "visible": true
775 },
776 {
777 "id": 2,
778 "shortcut": [["Control", "y"]],
779 "enabled": false,
780 "label": "_Redo",
781 "visible": true
782 },
783 {
784 "id": 1,
785 "shortcut": [["Control", "z"]],
786 "enabled": false,
787 "label": "_Undo",
788 "visible": true
789 }
790 ]
791 },
792 {
793 "id": 125,
794 "enabled": true,
795 "label": "Select",
796 "children-display": "submenu",
797 "visible": true,
798 "submenu": [
799 {
800 "id": 126,
801 "enabled": false,
802 "label": "To Path",
803 "visible": true
804 },
805 {
806 "id": 127,
807 "enabled": true,
808 "label": "Save to Channel",
809 "visible": true
810 },
811 {
812 "id": 128,
813 "shortcut": [["Shift", "q"]],
814 "enabled": true,
815 "toggle-state": 0,
816 "label": "Toggle Quick Mask",
817 "toggle-type": "checkmark",
818 "visible": true
819 },
820 {
821 "id": 129,
822 "type": "separator"
823 },
824 {
825 "id": 130,
826 "enabled": true,
827 "label": "Distort...",
828 "visible": true
829 },
830 {
831 "id": 131,
832 "enabled": false,
833 "label": "Border...",
834 "visible": true
835 },
836 {
837 "id": 132,
838 "enabled": false,
839 "label": "Grow...",
840 "visible": true
841 },
842 {
843 "id": 133,
844 "enabled": false,
845 "label": "Shrink...",
846 "visible": true
847 },
848 {
849 "id": 134,
850 "enabled": false,
851 "label": "Sharpen",
852 "visible": true
853 },
854 {
855 "id": 135,
856 "enabled": false,
857 "label": "Feather...",
858 "visible": true
859 },
860 {
861 "id": 136,
862 "type": "separator"
863 },
864 {
865 "id": 137,
866 "enabled": true,
867 "label": "Selection Editor",
868 "visible": true
869 },
870 {
871 "id": 138,
872 "shortcut": [["Shift", "v"]],
873 "enabled": false,
874 "label": "From Path",
875 "visible": true
876 },
877 {
878 "id": 139,
879 "shortcut": [["Shift", "o"]],
880 "enabled": true,
881 "label": "By Color",
882 "visible": true
883 },
884 {
885 "id": 140,
886 "shortcut": [["Control", "Shift", "l"]],
887 "enabled": false,
888 "label": "Float",
889 "visible": true
890 },
891 {
892 "id": 141,
893 "shortcut": [["Control", "i"]],
894 "enabled": true,
895 "label": "Invert",
896 "visible": true
897 },
898 {
899 "id": 142,
900 "shortcut": [["Control", "Shift", "a"]],
901 "enabled": false,
902 "label": "None",
903 "visible": true
904 },
905 {
906 "id": 143,
907 "shortcut": [["Control", "a"]],
908 "enabled": true,
909 "label": "All",
910 "visible": true
911 }
912 ]
913 },
914 {
915 "id": 144,
916 "enabled": true,
917 "label": "View",
918 "children-display": "submenu",
919 "visible": true,
920 "submenu": [
921 {
922 "id": 145,
923 "enabled": true,
924 "toggle-state": 1,
925 "label": "Show Statusbar",
926 "toggle-type": "checkmark",
927 "visible": true
928 },
929 {
930 "id": 146,
931 "enabled": true,
932 "toggle-state": 0,
933 "label": "Show Scrollbars",
934 "toggle-type": "checkmark",
935 "visible": true
936 },
937 {
938 "id": 147,
939 "shortcut": [["Control", "Shift", "r"]],
940 "enabled": true,
941 "toggle-state": 0,
942 "label": "Show Rulers",
943 "toggle-type": "checkmark",
944 "visible": true
945 },
946 {
947 "id": 148,
948 "enabled": true,
949 "toggle-state": 1,
950 "label": "Show Menubar",
951 "toggle-type": "checkmark",
952 "visible": true
953 },
954 {
955 "id": 149,
956 "enabled": true,
957 "label": "Padding Color",
958 "children-display": "submenu",
959 "visible": true,
960 "submenu": [
961 {
962 "id": 150,
963 "enabled": true,
964 "label": "As in Preferences",
965 "visible": true
966 },
967 {
968 "id": 151,
969 "type": "separator"
970 },
971 {
972 "id": 152,
973 "enabled": true,
974 "label": "Select Custom Color...",
975 "visible": true
976 },
977 {
978 "id": 153,
979 "enabled": true,
980 "label": "Dark Check Color",
981 "visible": true
982 },
983 {
984 "id": 154,
985 "enabled": true,
986 "label": "Light Check Color",
987 "visible": true
988 },
989 {
990 "id": 155,
991 "enabled": true,
992 "label": "From Theme",
993 "visible": true
994 }
995 ]
996 },
997 {
998 "id": 156,
999 "type": "separator"
1000 },
1001 {
1002 "id": 157,
1003 "enabled": true,
1004 "toggle-state": 0,
1005 "label": "Snap to Active Path",
1006 "toggle-type": "checkmark",
1007 "visible": true
1008 },
1009 {
1010 "id": 158,
1011 "enabled": true,
1012 "toggle-state": 0,
1013 "label": "Snap to Canvas Edges",
1014 "toggle-type": "checkmark",
1015 "visible": true
1016 },
1017 {
1018 "id": 159,
1019 "enabled": true,
1020 "toggle-state": 0,
1021 "label": "Snap to Grid",
1022 "toggle-type": "checkmark",
1023 "visible": true
1024 },
1025 {
1026 "id": 160,
1027 "enabled": true,
1028 "toggle-state": 1,
1029 "label": "Snap to Guides",
1030 "toggle-type": "checkmark",
1031 "visible": true
1032 },
1033 {
1034 "id": 161,
1035 "type": "separator"
1036 },
1037 {
1038 "id": 162,
1039 "enabled": true,
1040 "toggle-state": 0,
1041 "label": "Show Sample Points",
1042 "toggle-type": "checkmark",
1043 "visible": true
1044 },
1045 {
1046 "id": 163,
1047 "enabled": true,
1048 "toggle-state": 0,
1049 "label": "Show Grid",
1050 "toggle-type": "checkmark",
1051 "visible": true
1052 },
1053 {
1054 "id": 164,
1055 "shortcut": [["Control", "Shift", "t"]],
1056 "enabled": true,
1057 "toggle-state": 0,
1058 "label": "Show Guides",
1059 "toggle-type": "checkmark",
1060 "visible": true
1061 },
1062 {
1063 "id": 165,
1064 "enabled": true,
1065 "toggle-state": 0,
1066 "label": "Show Layer Boundary",
1067 "toggle-type": "checkmark",
1068 "visible": true
1069 },
1070 {
1071 "id": 166,
1072 "shortcut": [["Control", "t"]],
1073 "enabled": true,
1074 "toggle-state": 0,
1075 "label": "Show Selection",
1076 "toggle-type": "checkmark",
1077 "visible": true
1078 },
1079 {
1080 "id": 167,
1081 "type": "separator"
1082 },
1083 {
1084 "id": 168,
1085 "enabled": true,
1086 "label": "Display Filters...",
1087 "visible": true
1088 },
1089 {
1090 "id": 169,
1091 "enabled": true,
1092 "label": "Navigation Window",
1093 "visible": true
1094 },
1095 {
1096 "id": 170,
1097 "type": "separator"
1098 },
1099 {
1100 "id": 171,
1101 "enabled": true,
1102 "shortcut": [["F11"]],
1103 "toggle-state": 0,
1104 "label": "Fullscreen",
1105 "toggle-type": "checkmark",
1106 "children-display": "submenu",
1107 "visible": true,
1108 "submenu": [
1109 {
1110 "id": 172,
1111 "enabled": true,
1112 "label": "Open Display...",
1113 "visible": true
1114 }
1115 ]
1116 },
1117 {
1118 "id": 173,
1119 "shortcut": [["Control", "e"]],
1120 "enabled": true,
1121 "label": "Shrink Wrap",
1122 "visible": true
1123 },
1124 {
1125 "id": 174,
1126 "type": "separator"
1127 },
1128 {
1129 "id": 175,
1130 "enabled": true,
1131 "label": "_Zoom (67%)",
1132 "children-display": "submenu",
1133 "visible": true,
1134 "submenu": [
1135 {
1136 "id": 176,
1137 "enabled": true,
1138 "toggle-state": 0,
1139 "label": "Othe_r (67%)...",
1140 "toggle-type": "checkmark",
1141 "visible": true
1142 },
1143 {
1144 "id": 177,
1145 "type": "separator"
1146 },
1147 {
1148 "id": 178,
1149 "enabled": true,
1150 "toggle-state": 0,
1151 "label": "1:16 (6.25%)",
1152 "toggle-type": "checkmark",
1153 "visible": true
1154 },
1155 {
1156 "id": 179,
1157 "enabled": true,
1158 "toggle-state": 0,
1159 "label": "1:8 (12.5%)",
1160 "toggle-type": "checkmark",
1161 "visible": true
1162 },
1163 {
1164 "id": 180,
1165 "enabled": true,
1166 "toggle-state": 0,
1167 "label": "1:4 (25%)",
1168 "toggle-type": "checkmark",
1169 "visible": true
1170 },
1171 {
1172 "id": 181,
1173 "enabled": true,
1174 "toggle-state": 0,
1175 "label": "1:2 (50%)",
1176 "toggle-type": "checkmark",
1177 "visible": true
1178 },
1179 {
1180 "id": 182,
1181 "shortcut": [["1"]],
1182 "enabled": true,
1183 "toggle-state": 1,
1184 "label": "1:1 (100%)",
1185 "toggle-type": "checkmark",
1186 "visible": true
1187 },
1188 {
1189 "id": 183,
1190 "enabled": true,
1191 "toggle-state": 0,
1192 "label": "2:1 (200%)",
1193 "toggle-type": "checkmark",
1194 "visible": true
1195 },
1196 {
1197 "id": 184,
1198 "enabled": true,
1199 "toggle-state": 0,
1200 "label": "4:1 (400%)",
1201 "toggle-type": "checkmark",
1202 "visible": true
1203 },
1204 {
1205 "id": 185,
1206 "enabled": true,
1207 "toggle-state": 0,
1208 "label": "8:1 (800%)",
1209 "toggle-type": "checkmark",
1210 "visible": true
1211 },
1212 {
1213 "id": 186,
1214 "enabled": true,
1215 "toggle-state": 0,
1216 "label": "16:1 (1600%)",
1217 "toggle-type": "checkmark",
1218 "visible": true
1219 },
1220 {
1221 "id": 187,
1222 "type": "separator"
1223 },
1224 {
1225 "id": 188,
1226 "enabled": true,
1227 "label": "Fill Window",
1228 "visible": true
1229 },
1230 {
1231 "id": 189,
1232 "shortcut": [["Control", "Shift", "e"]],
1233 "enabled": true,
1234 "label": "Fit Image in Window",
1235 "visible": true
1236 },
1237 {
1238 "id": 190,
1239 "shortcut": [["plus"]],
1240 "enabled": true,
1241 "label": "Zoom In",
1242 "visible": true
1243 },
1244 {
1245 "id": 191,
1246 "shortcut": [["minus"]],
1247 "enabled": true,
1248 "label": "Zoom Out",
1249 "visible": true
1250 },
1251 {
1252 "id": 4,
1253 "shortcut": [["grave"]],
1254 "enabled": true,
1255 "label": "Re_vert Zoom (67%)",
1256 "visible": true
1257 }
1258 ]
1259 },
1260 {
1261 "id": 192,
1262 "enabled": true,
1263 "toggle-state": 1,
1264 "label": "Dot for Dot",
1265 "toggle-type": "checkmark",
1266 "visible": true
1267 },
1268 {
1269 "id": 193,
1270 "enabled": true,
1271 "label": "New View",
1272 "visible": true
1273 }
1274 ]
1275 },
1276 {
1277 "id": 194,
1278 "enabled": true,
1279 "label": "Image",
1280 "children-display": "submenu",
1281 "visible": true,
1282 "submenu": [
1283 {
1284 "id": 195,
1285 "shortcut": [["Alt", "Return"]],
1286 "enabled": true,
1287 "label": "Image Properties",
1288 "visible": true
1289 },
1290 {
1291 "id": 196,
1292 "enabled": true,
1293 "label": "Configure Grid...",
1294 "visible": true
1295 },
1296 {
1297 "id": 197,
1298 "enabled": true,
1299 "label": "Guides",
1300 "children-display": "submenu",
1301 "visible": true,
1302 "submenu": [
1303 {
1304 "id": 198,
1305 "enabled": true,
1306 "label": "Remove all Guides",
1307 "visible": true
1308 },
1309 {
1310 "id": 199,
1311 "enabled": true,
1312 "label": "New Guides from Selection",
1313 "visible": true
1314 },
1315 {
1316 "id": 200,
1317 "enabled": true,
1318 "label": "New Guide...",
1319 "visible": true
1320 },
1321 {
1322 "id": 201,
1323 "enabled": true,
1324 "label": "New Guide (by Percent)...",
1325 "visible": true
1326 }
1327 ]
1328 },
1329 {
1330 "id": 202,
1331 "type": "separator"
1332 },
1333 {
1334 "id": 203,
1335 "enabled": true,
1336 "label": "Align Visible Layers...",
1337 "visible": true
1338 },
1339 {
1340 "id": 204,
1341 "enabled": true,
1342 "label": "Flatten Image",
1343 "visible": true
1344 },
1345 {
1346 "id": 205,
1347 "shortcut": [["Control", "m"]],
1348 "enabled": true,
1349 "label": "Merge Visible Layers...",
1350 "visible": true
1351 },
1352 {
1353 "id": 206,
1354 "type": "separator"
1355 },
1356 {
1357 "id": 207,
1358 "enabled": true,
1359 "label": "Zealous Crop",
1360 "visible": true
1361 },
1362 {
1363 "id": 208,
1364 "enabled": true,
1365 "label": "Autocrop Image",
1366 "visible": true
1367 },
1368 {
1369 "id": 209,
1370 "enabled": false,
1371 "label": "Crop to Selection",
1372 "visible": true
1373 },
1374 {
1375 "id": 210,
1376 "type": "separator"
1377 },
1378 {
1379 "id": 211,
1380 "enabled": true,
1381 "label": "Scale Image...",
1382 "visible": true
1383 },
1384 {
1385 "id": 212,
1386 "enabled": true,
1387 "label": "Print Size...",
1388 "visible": true
1389 },
1390 {
1391 "id": 213,
1392 "enabled": false,
1393 "label": "Fit Canvas to Selection",
1394 "visible": true
1395 },
1396 {
1397 "id": 214,
1398 "enabled": true,
1399 "label": "Fit Canvas to Layers",
1400 "visible": true
1401 },
1402 {
1403 "id": 215,
1404 "enabled": true,
1405 "label": "Canvas Size...",
1406 "visible": true
1407 },
1408 {
1409 "id": 216,
1410 "type": "separator"
1411 },
1412 {
1413 "id": 217,
1414 "enabled": true,
1415 "label": "Transform",
1416 "children-display": "submenu",
1417 "visible": true,
1418 "submenu": [
1419 {
1420 "id": 218,
1421 "enabled": true,
1422 "label": "Guillotine",
1423 "visible": true
1424 },
1425 {
1426 "id": 219,
1427 "type": "separator"
1428 },
1429 {
1430 "id": 220,
1431 "enabled": true,
1432 "label": "Rotate 180\302\260",
1433 "visible": true
1434 },
1435 {
1436 "id": 221,
1437 "enabled": true,
1438 "label": "Rotate 90\302\260 counter-clockwise",
1439 "visible": true
1440 },
1441 {
1442 "id": 222,
1443 "enabled": true,
1444 "label": "Rotate 90\302\260 clockwise",
1445 "visible": true
1446 },
1447 {
1448 "id": 223,
1449 "type": "separator"
1450 },
1451 {
1452 "id": 224,
1453 "enabled": true,
1454 "label": "Flip Vertically",
1455 "visible": true
1456 },
1457 {
1458 "id": 225,
1459 "enabled": true,
1460 "label": "Flip Horizontally",
1461 "visible": true
1462 }
1463 ]
1464 },
1465 {
1466 "id": 226,
1467 "enabled": true,
1468 "label": "Mode",
1469 "children-display": "submenu",
1470 "visible": true,
1471 "submenu": [
1472 {
1473 "id": 227,
1474 "enabled": true,
1475 "label": "Convert to Color Profile...",
1476 "visible": true
1477 },
1478 {
1479 "id": 228,
1480 "enabled": true,
1481 "label": "Assign Color Profile...",
1482 "visible": true
1483 },
1484 {
1485 "id": 229,
1486 "type": "separator"
1487 },
1488 {
1489 "id": 230,
1490 "enabled": true,
1491 "toggle-state": 0,
1492 "label": "Indexed...",
1493 "toggle-type": "checkmark",
1494 "visible": true
1495 },
1496 {
1497 "id": 231,
1498 "enabled": true,
1499 "toggle-state": 0,
1500 "label": "Grayscale",
1501 "toggle-type": "checkmark",
1502 "visible": true
1503 },
1504 {
1505 "id": 232,
1506 "enabled": true,
1507 "toggle-state": 1,
1508 "label": "RGB",
1509 "toggle-type": "checkmark",
1510 "visible": true
1511 }
1512 ]
1513 },
1514 {
1515 "id": 233,
1516 "shortcut": [["Control", "d"]],
1517 "enabled": true,
1518 "label": "Duplicate",
1519 "visible": true
1520 }
1521 ]
1522 },
1523 {
1524 "id": 234,
1525 "enabled": true,
1526 "label": "Layer",
1527 "children-display": "submenu",
1528 "visible": true,
1529 "submenu": [
1530 {
1531 "id": 235,
1532 "enabled": true,
1533 "label": "Autocrop Layer",
1534 "visible": true
1535 },
1536 {
1537 "id": 236,
1538 "enabled": false,
1539 "label": "Crop to Selection",
1540 "visible": true
1541 },
1542 {
1543 "id": 237,
1544 "enabled": true,
1545 "label": "Scale Layer...",
1546 "visible": true
1547 },
1548 {
1549 "id": 238,
1550 "enabled": true,
1551 "label": "Layer to Image Size",
1552 "visible": true
1553 },
1554 {
1555 "id": 239,
1556 "enabled": true,
1557 "label": "Layer Boundary Size...",
1558 "visible": true
1559 },
1560 {
1561 "id": 240,
1562 "type": "separator"
1563 },
1564 {
1565 "id": 241,
1566 "enabled": true,
1567 "label": "Transform",
1568 "children-display": "submenu",
1569 "visible": true,
1570 "submenu": [
1571 {
1572 "id": 242,
1573 "shortcut": [["Control", "Shift", "o"]],
1574 "enabled": true,
1575 "label": "Offset...",
1576 "visible": true
1577 },
1578 {
1579 "id": 243,
1580 "type": "separator"
1581 },
1582 {
1583 "id": 244,
1584 "enabled": true,
1585 "label": "Arbitrary Rotation...",
1586 "visible": true
1587 },
1588 {
1589 "id": 245,
1590 "enabled": true,
1591 "label": "Rotate 180\302\260",
1592 "visible": true
1593 },
1594 {
1595 "id": 246,
1596 "enabled": true,
1597 "label": "Rotate 90\302\260 counter-clockwise",
1598 "visible": true
1599 },
1600 {
1601 "id": 247,
1602 "enabled": true,
1603 "label": "Rotate 90\302\260 clockwise",
1604 "visible": true
1605 },
1606 {
1607 "id": 248,
1608 "type": "separator"
1609 },
1610 {
1611 "id": 249,
1612 "enabled": true,
1613 "label": "Flip Vertically",
1614 "visible": true
1615 },
1616 {
1617 "id": 250,
1618 "enabled": true,
1619 "label": "Flip Horizontally",
1620 "visible": true
1621 }
1622 ]
1623 },
1624 {
1625 "id": 251,
1626 "enabled": true,
1627 "label": "Transparency",
1628 "children-display": "submenu",
1629 "visible": true,
1630 "submenu": [
1631 {
1632 "id": 252,
1633 "enabled": true,
1634 "label": "Intersect with Selection",
1635 "visible": true
1636 },
1637 {
1638 "id": 253,
1639 "enabled": true,
1640 "label": "Subtract from Selection",
1641 "visible": true
1642 },
1643 {
1644 "id": 254,
1645 "enabled": true,
1646 "label": "Add to Selection",
1647 "visible": true
1648 },
1649 {
1650 "id": 255,
1651 "enabled": true,
1652 "label": "Alpha to Selection",
1653 "visible": true
1654 },
1655 {
1656 "id": 256,
1657 "type": "separator"
1658 },
1659 {
1660 "id": 257,
1661 "enabled": true,
1662 "label": "Threshold Alpha...",
1663 "visible": true
1664 },
1665 {
1666 "id": 258,
1667 "enabled": true,
1668 "label": "Semi-Flatten",
1669 "visible": true
1670 },
1671 {
1672 "id": 259,
1673 "enabled": true,
1674 "label": "Color to Alpha...",
1675 "visible": true
1676 },
1677 {
1678 "id": 260,
1679 "enabled": true,
1680 "label": "Remove Alpha Channel",
1681 "visible": true
1682 },
1683 {
1684 "id": 261,
1685 "enabled": false,
1686 "label": "Add Alpha Channel",
1687 "visible": true
1688 }
1689 ]
1690 },
1691 {
1692 "id": 262,
1693 "enabled": true,
1694 "label": "Mask",
1695 "children-display": "submenu",
1696 "visible": true,
1697 "submenu": [
1698 {
1699 "id": 263,
1700 "enabled": false,
1701 "label": "Intersect with Selection",
1702 "visible": true
1703 },
1704 {
1705 "id": 264,
1706 "enabled": false,
1707 "label": "Subtract from Selection",
1708 "visible": true
1709 },
1710 {
1711 "id": 265,
1712 "enabled": false,
1713 "label": "Add to Selection",
1714 "visible": true
1715 },
1716 {
1717 "id": 266,
1718 "enabled": false,
1719 "label": "Mask to Selection",
1720 "visible": true
1721 },
1722 {
1723 "id": 267,
1724 "type": "separator"
1725 },
1726 {
1727 "id": 268,
1728 "enabled": false,
1729 "toggle-state": 0,
1730 "label": "Disable Layer Mask",
1731 "toggle-type": "checkmark",
1732 "visible": true
1733 },
1734 {
1735 "id": 269,
1736 "enabled": false,
1737 "toggle-state": 0,
1738 "label": "Edit Layer Mask",
1739 "toggle-type": "checkmark",
1740 "visible": true
1741 },
1742 {
1743 "id": 270,
1744 "enabled": false,
1745 "toggle-state": 0,
1746 "label": "Show Layer Mask",
1747 "toggle-type": "checkmark",
1748 "visible": true
1749 },
1750 {
1751 "id": 271,
1752 "type": "separator"
1753 },
1754 {
1755 "id": 272,
1756 "enabled": false,
1757 "label": "Delete Layer Mask",
1758 "visible": true
1759 },
1760 {
1761 "id": 273,
1762 "enabled": false,
1763 "label": "Apply Layer Mask",
1764 "visible": true
1765 },
1766 {
1767 "id": 274,
1768 "enabled": true,
1769 "label": "Add Layer Mask...",
1770 "visible": true
1771 }
1772 ]
1773 },
1774 {
1775 "id": 275,
1776 "enabled": true,
1777 "label": "Stack",
1778 "children-display": "submenu",
1779 "visible": true,
1780 "submenu": [
1781 {
1782 "id": 276,
1783 "enabled": true,
1784 "label": "Reverse Layer Order",
1785 "visible": true
1786 },
1787 {
1788 "id": 277,
1789 "type": "separator"
1790 },
1791 {
1792 "id": 278,
1793 "enabled": false,
1794 "label": "Layer to Bottom",
1795 "visible": true
1796 },
1797 {
1798 "id": 279,
1799 "enabled": false,
1800 "label": "Layer to Top",
1801 "visible": true
1802 },
1803 {
1804 "id": 280,
1805 "enabled": false,
1806 "label": "Lower Layer",
1807 "visible": true
1808 },
1809 {
1810 "id": 281,
1811 "enabled": false,
1812 "label": "Raise Layer",
1813 "visible": true
1814 },
1815 {
1816 "id": 282,
1817 "type": "separator"
1818 },
1819 {
1820 "id": 283,
1821 "shortcut": [["End"]],
1822 "enabled": false,
1823 "label": "Select Bottom Layer",
1824 "visible": true
1825 },
1826 {
1827 "id": 284,
1828 "shortcut": [["Home"]],
1829 "enabled": false,
1830 "label": "Select Top Layer",
1831 "visible": true
1832 },
1833 {
1834 "id": 285,
1835 "shortcut": [["Page_Down"]],
1836 "enabled": false,
1837 "label": "Select Next Layer",
1838 "visible": true
1839 },
1840 {
1841 "id": 286,
1842 "shortcut": [["Page_Up"]],
1843 "enabled": false,
1844 "label": "Select Previous Layer",
1845 "visible": true
1846 }
1847 ]
1848 },
1849 {
1850 "id": 287,
1851 "type": "separator",
1852 "children-display": "submenu",
1853 "submenu": [
1854 {
1855 "id": 288,
1856 "enabled": false,
1857 "label": "Empty",
1858 "visible": true
1859 }
1860 ]
1861 },
1862 {
1863 "id": 289,
1864 "enabled": true,
1865 "label": "Delete Layer",
1866 "visible": true
1867 },
1868 {
1869 "id": 290,
1870 "enabled": false,
1871 "label": "Merge Down",
1872 "visible": true
1873 },
1874 {
1875 "id": 291,
1876 "shortcut": [["Control", "h"]],
1877 "enabled": false,
1878 "label": "Anchor Layer",
1879 "visible": true
1880 },
1881 {
1882 "id": 292,
1883 "shortcut": [["Control", "Shift", "d"]],
1884 "enabled": true,
1885 "label": "Duplicate Layer",
1886 "visible": true
1887 },
1888 {
1889 "id": 293,
1890 "enabled": true,
1891 "label": "New from Visible",
1892 "visible": true
1893 },
1894 {
1895 "id": 294,
1896 "shortcut": [["Control", "Shift", "n"]],
1897 "enabled": true,
1898 "label": "New Layer...",
1899 "visible": true
1900 }
1901 ]
1902 },
1903 {
1904 "id": 295,
1905 "enabled": true,
1906 "label": "Colors",
1907 "children-display": "submenu",
1908 "visible": true,
1909 "submenu": [
1910 {
1911 "id": 296,
1912 "enabled": true,
1913 "label": "Retinex...",
1914 "visible": true
1915 },
1916 {
1917 "id": 297,
1918 "enabled": true,
1919 "label": "Maximum RGB...",
1920 "visible": true
1921 },
1922 {
1923 "id": 298,
1924 "enabled": false,
1925 "label": "Hot...",
1926 "visible": true
1927 },
1928 {
1929 "id": 299,
1930 "enabled": true,
1931 "label": "Filter Pack...",
1932 "visible": true
1933 },
1934 {
1935 "id": 300,
1936 "enabled": true,
1937 "label": "Color to Alpha...",
1938 "visible": true
1939 },
1940 {
1941 "id": 301,
1942 "enabled": true,
1943 "label": "Colorify...",
1944 "visible": true
1945 },
1946 {
1947 "id": 302,
1948 "type": "separator"
1949 },
1950 {
1951 "id": 303,
1952 "enabled": true,
1953 "label": "Info",
1954 "children-display": "submenu",
1955 "visible": true,
1956 "submenu": [
1957 {
1958 "id": 304,
1959 "enabled": true,
1960 "label": "Smooth Palette...",
1961 "visible": true
1962 },
1963 {
1964 "id": 305,
1965 "enabled": true,
1966 "label": "Colorcube Analysis...",
1967 "visible": true
1968 },
1969 {
1970 "id": 306,
1971 "enabled": true,
1972 "label": "Border Average...",
1973 "visible": true
1974 },
1975 {
1976 "id": 307,
1977 "enabled": true,
1978 "label": "Histogram",
1979 "visible": true
1980 }
1981 ]
1982 },
1983 {
1984 "id": 308,
1985 "enabled": true,
1986 "label": "Map",
1987 "children-display": "submenu",
1988 "visible": true,
1989 "submenu": [
1990 {
1991 "id": 309,
1992 "enabled": true,
1993 "label": "Sample Colorize...",
1994 "visible": true
1995 },
1996 {
1997 "id": 310,
1998 "enabled": true,
1999 "label": "Rotate Colors...",
2000 "visible": true
2001 },
2002 {
2003 "id": 311,
2004 "enabled": true,
2005 "label": "Palette Map",
2006 "visible": true
2007 },
2008 {
2009 "id": 312,
2010 "enabled": true,
2011 "label": "Gradient Map",
2012 "visible": true
2013 },
2014 {
2015 "id": 313,
2016 "enabled": true,
2017 "label": "Color Exchange...",
2018 "visible": true
2019 },
2020 {
2021 "id": 314,
2022 "enabled": true,
2023 "label": "Alien Map...",
2024 "visible": true
2025 },
2026 {
2027 "id": 315,
2028 "type": "separator"
2029 },
2030 {
2031 "id": 316,
2032 "enabled": false,
2033 "label": "Set Colormap...",
2034 "visible": true
2035 },
2036 {
2037 "id": 317,
2038 "enabled": false,
2039 "label": "Rearrange Colormap...",
2040 "visible": true
2041 }
2042 ]
2043 },
2044 {
2045 "id": 318,
2046 "enabled": true,
2047 "label": "Components",
2048 "children-display": "submenu",
2049 "visible": true,
2050 "submenu": [
2051 {
2052 "id": 319,
2053 "enabled": false,
2054 "label": "Recompose",
2055 "visible": true
2056 },
2057 {
2058 "id": 320,
2059 "enabled": true,
2060 "label": "Decompose...",
2061 "visible": true
2062 },
2063 {
2064 "id": 321,
2065 "enabled": false,
2066 "label": "Compose...",
2067 "visible": true
2068 },
2069 {
2070 "id": 322,
2071 "enabled": true,
2072 "label": "Channel Mixer...",
2073 "visible": true
2074 }
2075 ]
2076 },
2077 {
2078 "id": 323,
2079 "enabled": true,
2080 "label": "Auto",
2081 "children-display": "submenu",
2082 "visible": true,
2083 "submenu": [
2084 {
2085 "id": 324,
2086 "enabled": true,
2087 "label": "Stretch HSV",
2088 "visible": true
2089 },
2090 {
2091 "id": 325,
2092 "enabled": true,
2093 "label": "Stretch Contrast",
2094 "visible": true
2095 },
2096 {
2097 "id": 326,
2098 "enabled": true,
2099 "label": "Normalize",
2100 "visible": true
2101 },
2102 {
2103 "id": 327,
2104 "enabled": true,
2105 "label": "Color Enhance",
2106 "visible": true
2107 },
2108 {
2109 "id": 328,
2110 "enabled": true,
2111 "label": "White Balance",
2112 "visible": true
2113 },
2114 {
2115 "id": 329,
2116 "enabled": true,
2117 "label": "Equalize",
2118 "visible": true
2119 }
2120 ]
2121 },
2122 {
2123 "id": 330,
2124 "type": "separator"
2125 },
2126 {
2127 "id": 331,
2128 "enabled": true,
2129 "toggle-state": 0,
2130 "label": "Use GEGL",
2131 "toggle-type": "checkmark",
2132 "visible": true
2133 },
2134 {
2135 "id": 332,
2136 "type": "separator"
2137 },
2138 {
2139 "id": 333,
2140 "enabled": true,
2141 "label": "Value Invert",
2142 "visible": true
2143 },
2144 {
2145 "id": 334,
2146 "enabled": true,
2147 "label": "Invert",
2148 "visible": true
2149 },
2150 {
2151 "id": 335,
2152 "type": "separator"
2153 },
2154 {
2155 "id": 336,
2156 "enabled": true,
2157 "label": "Desaturate...",
2158 "visible": true
2159 },
2160 {
2161 "id": 337,
2162 "enabled": true,
2163 "label": "Posterize...",
2164 "visible": true
2165 },
2166 {
2167 "id": 338,
2168 "enabled": true,
2169 "label": "Curves...",
2170 "visible": true
2171 },
2172 {
2173 "id": 339,
2174 "enabled": true,
2175 "label": "Levels...",
2176 "visible": true
2177 },
2178 {
2179 "id": 340,
2180 "enabled": true,
2181 "label": "Threshold...",
2182 "visible": true
2183 },
2184 {
2185 "id": 341,
2186 "enabled": true,
2187 "label": "Brightness-Contrast...",
2188 "visible": true
2189 },
2190 {
2191 "id": 342,
2192 "enabled": true,
2193 "label": "Colorize...",
2194 "visible": true
2195 },
2196 {
2197 "id": 343,
2198 "enabled": true,
2199 "label": "Hue-Saturation...",
2200 "visible": true
2201 },
2202 {
2203 "id": 344,
2204 "enabled": true,
2205 "label": "Color Balance...",
2206 "visible": true
2207 }
2208 ]
2209 },
2210 {
2211 "id": 345,
2212 "enabled": true,
2213 "label": "Tools",
2214 "children-display": "submenu",
2215 "visible": true,
2216 "submenu": [
2217 {
2218 "id": 346,
2219 "shortcut": [["x"]],
2220 "enabled": true,
2221 "label": "Swap Colors",
2222 "visible": true
2223 },
2224 {
2225 "id": 347,
2226 "shortcut": [["d"]],
2227 "enabled": true,
2228 "label": "Default Colors",
2229 "visible": true
2230 },
2231 {
2232 "id": 348,
2233 "shortcut": [["Control", "b"]],
2234 "enabled": true,
2235 "label": "Toolbox",
2236 "visible": true
2237 },
2238 {
2239 "id": 349,
2240 "type": "separator"
2241 },
2242 {
2243 "id": 350,
2244 "enabled": true,
2245 "label": "GEGL Operation...",
2246 "visible": true
2247 },
2248 {
2249 "id": 351,
2250 "shortcut": [["t"]],
2251 "enabled": true,
2252 "label": "Text",
2253 "visible": true
2254 },
2255 {
2256 "id": 352,
2257 "shortcut": [["Shift", "m"]],
2258 "enabled": true,
2259 "label": "Measure",
2260 "visible": true
2261 },
2262 {
2263 "id": 353,
2264 "shortcut": [["z"]],
2265 "enabled": true,
2266 "label": "Zoom",
2267 "visible": true
2268 },
2269 {
2270 "id": 354,
2271 "shortcut": [["o"]],
2272 "enabled": true,
2273 "label": "Color Picker",
2274 "visible": true
2275 },
2276 {
2277 "id": 355,
2278 "shortcut": [["b"]],
2279 "enabled": true,
2280 "label": "Paths",
2281 "visible": true
2282 },
2283 {
2284 "id": 356,
2285 "enabled": true,
2286 "label": "Color Tools",
2287 "children-display": "submenu",
2288 "visible": true,
2289 "submenu": [
2290 {
2291 "id": 357,
2292 "enabled": true,
2293 "label": "Desaturate...",
2294 "visible": true
2295 },
2296 {
2297 "id": 358,
2298 "enabled": true,
2299 "label": "Posterize...",
2300 "visible": true
2301 },
2302 {
2303 "id": 359,
2304 "enabled": true,
2305 "label": "Curves...",
2306 "visible": true
2307 },
2308 {
2309 "id": 360,
2310 "enabled": true,
2311 "label": "Levels...",
2312 "visible": true
2313 },
2314 {
2315 "id": 361,
2316 "enabled": true,
2317 "label": "Threshold...",
2318 "visible": true
2319 },
2320 {
2321 "id": 362,
2322 "enabled": true,
2323 "label": "Brightness-Contrast...",
2324 "visible": true
2325 },
2326 {
2327 "id": 363,
2328 "enabled": true,
2329 "label": "Colorize...",
2330 "visible": true
2331 },
2332 {
2333 "id": 364,
2334 "enabled": true,
2335 "label": "Hue-Saturation...",
2336 "visible": true
2337 },
2338 {
2339 "id": 365,
2340 "enabled": true,
2341 "label": "Color Balance...",
2342 "visible": true
2343 }
2344 ]
2345 },
2346 {
2347 "id": 366,
2348 "enabled": true,
2349 "label": "Transform Tools",
2350 "children-display": "submenu",
2351 "visible": true,
2352 "submenu": [
2353 {
2354 "id": 367,
2355 "shortcut": [["Shift", "f"]],
2356 "enabled": true,
2357 "label": "Flip",
2358 "visible": true
2359 },
2360 {
2361 "id": 368,
2362 "shortcut": [["Shift", "p"]],
2363 "enabled": true,
2364 "label": "Perspective",
2365 "visible": true
2366 },
2367 {
2368 "id": 369,
2369 "shortcut": [["Shift", "s"]],
2370 "enabled": true,
2371 "label": "Shear",
2372 "visible": true
2373 },
2374 {
2375 "id": 370,
2376 "shortcut": [["Shift", "t"]],
2377 "enabled": true,
2378 "label": "Scale",
2379 "visible": true
2380 },
2381 {
2382 "id": 371,
2383 "shortcut": [["Shift", "r"]],
2384 "enabled": true,
2385 "label": "Rotate",
2386 "visible": true
2387 },
2388 {
2389 "id": 372,
2390 "shortcut": [["Shift", "c"]],
2391 "enabled": true,
2392 "label": "Crop",
2393 "visible": true
2394 },
2395 {
2396 "id": 373,
2397 "shortcut": [["m"]],
2398 "enabled": true,
2399 "label": "Move",
2400 "visible": true
2401 },
2402 {
2403 "id": 374,
2404 "shortcut": [["q"]],
2405 "enabled": true,
2406 "label": "Align",
2407 "visible": true
2408 }
2409 ]
2410 },
2411 {
2412 "id": 375,
2413 "enabled": true,
2414 "label": "Paint Tools",
2415 "children-display": "submenu",
2416 "visible": true,
2417 "submenu": [
2418 {
2419 "id": 376,
2420 "shortcut": [["Shift", "d"]],
2421 "enabled": true,
2422 "label": "Dodge / Burn",
2423 "visible": true
2424 },
2425 {
2426 "id": 377,
2427 "shortcut": [["s"]],
2428 "enabled": true,
2429 "label": "Smudge",
2430 "visible": true
2431 },
2432 {
2433 "id": 378,
2434 "shortcut": [["Shift", "u"]],
2435 "enabled": true,
2436 "label": "Blur / Sharpen",
2437 "visible": true
2438 },
2439 {
2440 "id": 379,
2441 "enabled": true,
2442 "label": "Perspective Clone",
2443 "visible": true
2444 },
2445 {
2446 "id": 380,
2447 "shortcut": [["h"]],
2448 "enabled": true,
2449 "label": "Heal",
2450 "visible": true
2451 },
2452 {
2453 "id": 381,
2454 "shortcut": [["c"]],
2455 "enabled": true,
2456 "label": "Clone",
2457 "visible": true
2458 },
2459 {
2460 "id": 382,
2461 "shortcut": [["k"]],
2462 "enabled": true,
2463 "label": "Ink",
2464 "visible": true
2465 },
2466 {
2467 "id": 383,
2468 "shortcut": [["a"]],
2469 "enabled": true,
2470 "label": "Airbrush",
2471 "visible": true
2472 },
2473 {
2474 "id": 384,
2475 "shortcut": [["Shift", "e"]],
2476 "enabled": true,
2477 "label": "Eraser",
2478 "visible": true
2479 },
2480 {
2481 "id": 385,
2482 "shortcut": [["p"]],
2483 "enabled": true,
2484 "label": "Paintbrush",
2485 "visible": true
2486 },
2487 {
2488 "id": 386,
2489 "shortcut": [["n"]],
2490 "enabled": true,
2491 "label": "Pencil",
2492 "visible": true
2493 },
2494 {
2495 "id": 387,
2496 "shortcut": [["l"]],
2497 "enabled": true,
2498 "label": "Blend",
2499 "visible": true
2500 },
2501 {
2502 "id": 388,
2503 "shortcut": [["Shift", "b"]],
2504 "enabled": true,
2505 "label": "Bucket Fill",
2506 "visible": true
2507 }
2508 ]
2509 },
2510 {
2511 "id": 389,
2512 "enabled": true,
2513 "label": "Selection Tools",
2514 "children-display": "submenu",
2515 "visible": true,
2516 "submenu": [
2517 {
2518 "id": 390,
2519 "shortcut": [["i"]],
2520 "enabled": true,
2521 "label": "Intelligent Scissors",
2522 "visible": true
2523 },
2524 {
2525 "id": 391,
2526 "shortcut": [["Shift", "o"]],
2527 "enabled": true,
2528 "label": "By Color Select",
2529 "visible": true
2530 },
2531 {
2532 "id": 392,
2533 "shortcut": [["u"]],
2534 "enabled": true,
2535 "label": "Fuzzy Select",
2536 "visible": true
2537 },
2538 {
2539 "id": 393,
2540 "enabled": true,
2541 "label": "Foreground Select",
2542 "visible": true
2543 },
2544 {
2545 "id": 394,
2546 "shortcut": [["f"]],
2547 "enabled": true,
2548 "label": "Free Select",
2549 "visible": true
2550 },
2551 {
2552 "id": 395,
2553 "shortcut": [["e"]],
2554 "enabled": true,
2555 "label": "Ellipse Select",
2556 "visible": true
2557 },
2558 {
2559 "id": 396,
2560 "shortcut": [["r"]],
2561 "enabled": true,
2562 "label": "Rectangle Select",
2563 "visible": true
2564 }
2565 ]
2566 }
2567 ]
2568 },
2569 {
2570 "id": 397,
2571 "enabled": true,
2572 "label": "Filters",
2573 "children-display": "submenu",
2574 "visible": true,
2575 "submenu": [
2576 {
2577 "id": 398,
2578 "enabled": true,
2579 "label": "Script-Fu",
2580 "children-display": "submenu",
2581 "visible": true,
2582 "submenu": [
2583 {
2584 "id": 399,
2585 "enabled": true,
2586 "label": "Start Server...",
2587 "visible": true
2588 },
2589 {
2590 "id": 400,
2591 "enabled": true,
2592 "label": "Refresh Scripts",
2593 "visible": true
2594 },
2595 {
2596 "id": 401,
2597 "enabled": true,
2598 "label": "Console",
2599 "visible": true
2600 }
2601 ]
2602 },
2603 {
2604 "id": 402,
2605 "enabled": true,
2606 "label": "Python-Fu",
2607 "children-display": "submenu",
2608 "visible": true,
2609 "submenu": [
2610 {
2611 "id": 403,
2612 "enabled": true,
2613 "label": "Console",
2614 "visible": true
2615 }
2616 ]
2617 },
2618 {
2619 "id": 404,
2620 "type": "separator"
2621 },
2622 {
2623 "id": 405,
2624 "enabled": true,
2625 "label": "Alpha to Logo",
2626 "children-display": "submenu",
2627 "visible": true,
2628 "submenu": [
2629 {
2630 "id": 406,
2631 "enabled": true,
2632 "label": "Textured...",
2633 "visible": true
2634 },
2635 {
2636 "id": 407,
2637 "enabled": true,
2638 "label": "Particle Trace...",
2639 "visible": true
2640 },
2641 {
2642 "id": 408,
2643 "enabled": true,
2644 "label": "Neon...",
2645 "visible": true
2646 },
2647 {
2648 "id": 409,
2649 "enabled": true,
2650 "label": "Gradient Bevel...",
2651 "visible": true
2652 },
2653 {
2654 "id": 410,
2655 "enabled": true,
2656 "label": "Glowing Hot...",
2657 "visible": true
2658 },
2659 {
2660 "id": 411,
2661 "enabled": true,
2662 "label": "Glossy...",
2663 "visible": true
2664 },
2665 {
2666 "id": 412,
2667 "enabled": true,
2668 "label": "Frosty...",
2669 "visible": true
2670 },
2671 {
2672 "id": 413,
2673 "enabled": true,
2674 "label": "Cool Metal...",
2675 "visible": true
2676 },
2677 {
2678 "id": 414,
2679 "enabled": true,
2680 "label": "Comic Book...",
2681 "visible": true
2682 },
2683 {
2684 "id": 415,
2685 "enabled": true,
2686 "label": "Chrome...",
2687 "visible": true
2688 },
2689 {
2690 "id": 416,
2691 "enabled": true,
2692 "label": "Chip Away...",
2693 "visible": true
2694 },
2695 {
2696 "id": 417,
2697 "enabled": true,
2698 "label": "Chalk...",
2699 "visible": true
2700 },
2701 {
2702 "id": 418,
2703 "enabled": true,
2704 "label": "Bovination...",
2705 "visible": true
2706 },
2707 {
2708 "id": 419,
2709 "enabled": true,
2710 "label": "Blended...",
2711 "visible": true
2712 },
2713 {
2714 "id": 420,
2715 "enabled": true,
2716 "label": "Basic I...",
2717 "visible": true
2718 },
2719 {
2720 "id": 421,
2721 "enabled": true,
2722 "label": "Basic II...",
2723 "visible": true
2724 },
2725 {
2726 "id": 422,
2727 "enabled": true,
2728 "label": "Alien Neon...",
2729 "visible": true
2730 },
2731 {
2732 "id": 423,
2733 "enabled": true,
2734 "label": "Alien Glow...",
2735 "visible": true
2736 },
2737 {
2738 "id": 424,
2739 "enabled": true,
2740 "label": "3D Outline...",
2741 "visible": true
2742 }
2743 ]
2744 },
2745 {
2746 "id": 425,
2747 "type": "separator"
2748 },
2749 {
2750 "id": 426,
2751 "enabled": true,
2752 "label": "Animation",
2753 "children-display": "submenu",
2754 "visible": true,
2755 "submenu": [
2756 {
2757 "id": 427,
2758 "enabled": true,
2759 "label": "Unoptimize",
2760 "visible": true
2761 },
2762 {
2763 "id": 428,
2764 "enabled": true,
2765 "label": "Playback...",
2766 "visible": true
2767 },
2768 {
2769 "id": 429,
2770 "enabled": true,
2771 "label": "Optimize (for GIF)",
2772 "visible": true
2773 },
2774 {
2775 "id": 430,
2776 "enabled": true,
2777 "label": "Optimize (Difference)",
2778 "visible": true
2779 },
2780 {
2781 "id": 431,
2782 "type": "separator"
2783 },
2784 {
2785 "id": 432,
2786 "enabled": true,
2787 "label": "Waves...",
2788 "visible": true
2789 },
2790 {
2791 "id": 433,
2792 "enabled": true,
2793 "label": "Spinning Globe...",
2794 "visible": true
2795 },
2796 {
2797 "id": 434,
2798 "enabled": true,
2799 "label": "Rippling...",
2800 "visible": true
2801 },
2802 {
2803 "id": 435,
2804 "enabled": true,
2805 "label": "Burn-In...",
2806 "visible": true
2807 },
2808 {
2809 "id": 436,
2810 "enabled": true,
2811 "label": "Blend...",
2812 "visible": true
2813 }
2814 ]
2815 },
2816 {
2817 "id": 437,
2818 "enabled": true,
2819 "label": "Web",
2820 "children-display": "submenu",
2821 "visible": true,
2822 "submenu": [
2823 {
2824 "id": 438,
2825 "enabled": true,
2826 "label": "Slice...",
2827 "visible": true
2828 },
2829 {
2830 "id": 439,
2831 "enabled": true,
2832 "label": "Semi-Flatten",
2833 "visible": true
2834 },
2835 {
2836 "id": 440,
2837 "enabled": true,
2838 "label": "Image Map...",
2839 "visible": true
2840 }
2841 ]
2842 },
2843 {
2844 "id": 441,
2845 "enabled": true,
2846 "label": "Render",
2847 "children-display": "submenu",
2848 "visible": true,
2849 "submenu": [
2850 {
2851 "id": 442,
2852 "enabled": true,
2853 "label": "Spyrogimp...",
2854 "visible": true
2855 },
2856 {
2857 "id": 443,
2858 "enabled": true,
2859 "label": "Sphere Designer...",
2860 "visible": true
2861 },
2862 {
2863 "id": 444,
2864 "enabled": true,
2865 "label": "Line Nova...",
2866 "visible": true
2867 },
2868 {
2869 "id": 445,
2870 "enabled": true,
2871 "label": "Lava...",
2872 "visible": true
2873 },
2874 {
2875 "id": 446,
2876 "enabled": true,
2877 "label": "Gfig...",
2878 "visible": true
2879 },
2880 {
2881 "id": 447,
2882 "enabled": true,
2883 "label": "Fractal Explorer...",
2884 "visible": true
2885 },
2886 {
2887 "id": 448,
2888 "enabled": true,
2889 "label": "Circuit...",
2890 "visible": true
2891 },
2892 {
2893 "id": 449,
2894 "type": "separator"
2895 },
2896 {
2897 "id": 450,
2898 "enabled": true,
2899 "label": "Pattern",
2900 "children-display": "submenu",
2901 "visible": true,
2902 "submenu": [
2903 {
2904 "id": 451,
2905 "enabled": true,
2906 "label": "Sinus...",
2907 "visible": true
2908 },
2909 {
2910 "id": 452,
2911 "enabled": true,
2912 "label": "Qbist...",
2913 "visible": true
2914 },
2915 {
2916 "id": 453,
2917 "enabled": true,
2918 "label": "Maze...",
2919 "visible": true
2920 },
2921 {
2922 "id": 454,
2923 "enabled": true,
2924 "label": "Jigsaw...",
2925 "visible": true
2926 },
2927 {
2928 "id": 455,
2929 "enabled": true,
2930 "label": "Grid...",
2931 "visible": true
2932 },
2933 {
2934 "id": 456,
2935 "enabled": true,
2936 "label": "Diffraction Patterns...",
2937 "visible": true
2938 },
2939 {
2940 "id": 457,
2941 "enabled": true,
2942 "label": "CML Explorer...",
2943 "visible": true
2944 },
2945 {
2946 "id": 458,
2947 "enabled": true,
2948 "label": "Checkerboard...",
2949 "visible": true
2950 }
2951 ]
2952 },
2953 {
2954 "id": 459,
2955 "enabled": true,
2956 "label": "Nature",
2957 "children-display": "submenu",
2958 "visible": true,
2959 "submenu": [
2960 {
2961 "id": 460,
2962 "enabled": true,
2963 "label": "IFS Fractal...",
2964 "visible": true
2965 },
2966 {
2967 "id": 461,
2968 "enabled": true,
2969 "label": "Flame...",
2970 "visible": true
2971 }
2972 ]
2973 },
2974 {
2975 "id": 462,
2976 "enabled": true,
2977 "label": "Clouds",
2978 "children-display": "submenu",
2979 "visible": true,
2980 "submenu": [
2981 {
2982 "id": 463,
2983 "enabled": true,
2984 "label": "Solid Noise...",
2985 "visible": true
2986 },
2987 {
2988 "id": 464,
2989 "enabled": true,
2990 "label": "Plasma...",
2991 "visible": true
2992 },
2993 {
2994 "id": 465,
2995 "enabled": true,
2996 "label": "Fog...",
2997 "visible": true
2998 },
2999 {
3000 "id": 466,
3001 "enabled": true,
3002 "label": "Difference Clouds...",
3003 "visible": true
3004 }
3005 ]
3006 }
3007 ]
3008 },
3009 {
3010 "id": 467,
3011 "enabled": true,
3012 "label": "Map",
3013 "children-display": "submenu",
3014 "visible": true,
3015 "submenu": [
3016 {
3017 "id": 468,
3018 "enabled": true,
3019 "label": "Warp...",
3020 "visible": true
3021 },
3022 {
3023 "id": 469,
3024 "enabled": true,
3025 "label": "Tile...",
3026 "visible": true
3027 },
3028 {
3029 "id": 470,
3030 "enabled": true,
3031 "label": "Small Tiles...",
3032 "visible": true
3033 },
3034 {
3035 "id": 471,
3036 "enabled": true,
3037 "label": "Paper Tile...",
3038 "visible": true
3039 },
3040 {
3041 "id": 472,
3042 "enabled": true,
3043 "label": "Map Object...",
3044 "visible": true
3045 },
3046 {
3047 "id": 473,
3048 "enabled": true,
3049 "label": "Make Seamless",
3050 "visible": true
3051 },
3052 {
3053 "id": 474,
3054 "enabled": true,
3055 "label": "Illusion...",
3056 "visible": true
3057 },
3058 {
3059 "id": 475,
3060 "enabled": true,
3061 "label": "Fractal Trace...",
3062 "visible": true
3063 },
3064 {
3065 "id": 476,
3066 "enabled": true,
3067 "label": "Displace...",
3068 "visible": true
3069 },
3070 {
3071 "id": 477,
3072 "enabled": true,
3073 "label": "Bump Map...",
3074 "visible": true
3075 }
3076 ]
3077 },
3078 {
3079 "id": 478,
3080 "enabled": true,
3081 "label": "Decor",
3082 "children-display": "submenu",
3083 "visible": true,
3084 "submenu": [
3085 {
3086 "id": 479,
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: