brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-json.h: Header for including the JSON
	parsing and data types.

	* clutter/json/json-types.h: Add JSON_NODE_VALUE_TYPE() macro.

	* clutter/json/Makefile.am: Install the JSON headers into a
	private location. This might change in the future, and might
	also cause collisions if you're using JSON-GLib and Clutter
	at the same time, so be warned.
This commit is contained in:
Emmanuele Bassi 2007-10-25 14:32:29 +00:00
parent eec01b6e73
commit 9c38eead46
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-json.h: Header for including the JSON
parsing and data types.
* clutter/json/json-types.h: Add JSON_NODE_VALUE_TYPE() macro.
* clutter/json/Makefile.am: Install the JSON headers into a
private location. This might change in the future, and might
also cause collisions if you're using JSON-GLib and Clutter
at the same time, so be warned.
2007-10-22 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-label.c (clutter_label_request_coords): If

8
clutter/clutter-json.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef __CLUTTER_JSON_H__
#define __CLUTTER_JSON_H__
#include "json/json-types.h"
#include "json/json-parser.h"
#include "json/json-generator.h"
#endif /* __CLUTTER_JSON_H__ */

2
clutter/json/Makefile.am
View File

@ -24,3 +24,5 @@ INCLUDES = \
$(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS)
clutterjsondir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter/json
clutterjson_HEADERS = $(source_h)

6
clutter/json/json-types.h
View File

@ -30,7 +30,11 @@ G_BEGIN_DECLS
*
* Evaluates to the #JsonNodeType contained by @node
*/
#define JSON_NODE_TYPE(node) (((JsonNode *) (node))->type)
#define JSON_NODE_TYPE(node) \
(((JsonNode *) (node))->type)
#define JSON_NODE_VALUE_TYPE(node) \
(G_VALUE_TYPE ((((JsonNode *) (node))->data.value))
#define JSON_TYPE_OBJECT (json_object_get_type ())
#define JSON_TYPE_ARRAY (json_array_get_type ())