diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:14:20 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:14:20 +0200 |
| commit | 674342c670052bcfcc92b7638de9af482ae2a856 (patch) | |
| tree | 0432b0802a7b35beaac76d51d797219a4b586d80 /tests/json-loader.h | |
| parent | 6830905830ac78271515c586442a090cf7a0e3ff (diff) | |
| parent | 271f62baede153472711c3dcf2388df3acffa006 (diff) | |
| download | libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.tar.gz libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.tar.bz2 libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.zip | |
Merged lp:~ubuntu-desktop/dbusmenu/ubuntu
* New upstream release.
∘ Protect against NULL nodes (LP: #602444)
∘ Remove extra warnings and messages
∘ Handle not having a session bus better (LP: #598715)
* New upstream release.
* Block building submenus on separators (LP: #598620)
* Adding more through JSON support for testing
* Fixing up value handling in dbusmenu-dumper
* debian/control, debian/libdbusmenu-jsonloader*install: Adding
two binary packages for the jsonloader test library.
* Merge Ubuntu.
Preserve Maintainer and Vcs-* fields.
* Standards-Version: 3.9.0
* Source-Format: 1.0 for now
- -doc packages are Arch:all
Diffstat (limited to 'tests/json-loader.h')
| -rw-r--r-- | tests/json-loader.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/json-loader.h b/tests/json-loader.h new file mode 100644 index 0000000..666bb6e --- /dev/null +++ b/tests/json-loader.h @@ -0,0 +1,31 @@ +/* +A loader to turn JSON into dbusmenu menuitems + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould <ted@canonical.com> + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef __DBUSMENU_JSON_LOADER_H__ +#define __DBUSMENU_JSON_LOADER_H__ + +#include <libdbusmenu-glib/menuitem.h> +#include <json-glib/json-glib.h> + +DbusmenuMenuitem * dbusmenu_json_build_from_node (const JsonNode * node); +DbusmenuMenuitem * dbusmenu_json_build_from_file (const gchar * filename); + +#endif /* __DBUSMENU_JSON_LOADER_H__ */ |