adium-1.4 2891:c20d3a8669ed: Updated libjson-glib.framework
commits at adium.im
commits at adium.im
Tue Jan 12 18:21:31 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/c20d3a8669ed
revision: 2891:c20d3a8669ed
author: Smew
date: Tue Jan 12 13:20:15 2010 -0500
Updated libjson-glib.framework
Subject: adium-1.4 2892:c45607416f2c: im.pidgin.adium.1-4 at 202724e8b2db59bbf4315c9e0a48069cf24b6881
details: http://hg.adium.im/adium-1.4/rev/c45607416f2c
revision: 2892:c45607416f2c
author: Smew
date: Tue Jan 12 13:21:24 2010 -0500
im.pidgin.adium.1-4 at 202724e8b2db59bbf4315c9e0a48069cf24b6881
diffs (232 lines):
diff -r 45171459da46 -r c45607416f2c Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Mon Jan 11 20:51:29 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Tue Jan 12 13:21:24 2010 -0500
@@ -12,11 +12,11 @@
G_BEGIN_DECLS
-/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.7.6/json-glib/json-parser.h" */
+/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
GType json_parser_error_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type())
-/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.7.6/json-glib/json-types.h" */
+/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
GType json_node_type_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_NODE_TYPE (json_node_type_get_type())
diff -r 45171459da46 -r c45607416f2c Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h Mon Jan 11 20:51:29 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h Tue Jan 12 13:21:24 2010 -0500
@@ -69,23 +69,85 @@
GType json_serializable_get_type (void) G_GNUC_CONST;
-JsonNode *json_serializable_serialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- const GValue *value,
- GParamSpec *pspec);
-gboolean json_serializable_deserialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- GValue *value,
- GParamSpec *pspec,
- JsonNode *property_node);
+JsonNode *json_serializable_serialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ const GValue *value,
+ GParamSpec *pspec);
+gboolean json_serializable_deserialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ GValue *value,
+ GParamSpec *pspec,
+ JsonNode *property_node);
+JsonNode *json_serializable_default_serialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ const GValue *value,
+ GParamSpec *pspec);
+gboolean json_serializable_default_deserialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ GValue *value,
+ GParamSpec *pspec,
+ JsonNode *property_node);
-GObject *json_construct_gobject (GType gtype,
- const gchar *data,
- gsize length,
- GError **error);
-gchar * json_serialize_gobject (GObject *gobject,
- gsize *length) G_GNUC_MALLOC;
+/**
+ * JsonBoxedSerializeFunc:
+ * @boxed: a #GBoxed
+ *
+ * Serializes the passed #GBoxed and stores it inside a #JsonNode
+ *
+ * Return value: the newly created #JsonNode
+ *
+ * Since: 0.10
+ */
+typedef JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed);
+
+/**
+ * JsonBoxedDeserializeFunc:
+ * @node: a #JsonNode
+ *
+ * Deserializes the contents of the passed #JsonNode into a #GBoxed
+ *
+ * Return value: the newly created boxed type
+ *
+ * Since: 0.10
+ */
+typedef gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node);
+
+void json_boxed_register_serialize_func (GType gboxed_type,
+ JsonNodeType node_type,
+ JsonBoxedSerializeFunc serialize_func);
+void json_boxed_register_deserialize_func (GType gboxed_type,
+ JsonNodeType node_type,
+ JsonBoxedDeserializeFunc deserialize_func);
+gboolean json_boxed_can_serialize (GType gboxed_type,
+ JsonNodeType *node_type);
+gboolean json_boxed_can_deserialize (GType gboxed_type,
+ JsonNodeType node_type);
+JsonNode *json_boxed_serialize (GType gboxed_type,
+ gconstpointer boxed);
+gpointer json_boxed_deserialize (GType gboxed_type,
+ JsonNode *node);
+
+JsonNode *json_gobject_serialize (GObject *gobject);
+GObject * json_gobject_deserialize (GType gtype,
+ JsonNode *node);
+
+GObject * json_gobject_from_data (GType gtype,
+ const gchar *data,
+ gssize length,
+ GError **error);
+gchar * json_gobject_to_data (GObject *gobject,
+ gsize *length);
+
+#ifndef JSON_DISABLE_DEPRECATED
+GObject * json_construct_gobject (GType gtype,
+ const gchar *data,
+ gsize length,
+ GError **error) G_GNUC_DEPRECATED;
+gchar * json_serialize_gobject (GObject *gobject,
+ gsize *length) G_GNUC_MALLOC G_GNUC_DEPRECATED;
+#endif /* JSON_DISABLE_DEPRECATED */
+
G_END_DECLS
diff -r 45171459da46 -r c45607416f2c Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h Mon Jan 11 20:51:29 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h Tue Jan 12 13:21:24 2010 -0500
@@ -40,6 +40,57 @@
*/
#define JSON_NODE_TYPE(node) (json_node_get_node_type ((node)))
+/**
+ * JSON_NODE_HOLDS:
+ * @node: a #JsonNode
+ * @t: a #JsonNodeType
+ *
+ * Evaluates to %TRUE if the @node holds type @t
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS(node,t) (json_node_get_node_type ((node)) == (t))
+
+/**
+ * JSON_NODE_HOLDS_VALUE:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_VALUE
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_VALUE(node) (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
+
+/**
+ * JSON_NODE_HOLDS_OBJECT:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_OBJECT
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_OBJECT(node) (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
+
+/**
+ * JSON_NODE_HOLDS_ARRAY:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_ARRAY
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_ARRAY(node) (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
+
+/**
+ * JSON_NODE_HOLDS_NULL:
+ * @node: a #JsonNode
+ *
+ * Evaluates to %TRUE if @node holds a %JSON_NODE_NULL
+ *
+ * Since: 0.10
+ */
+#define JSON_NODE_HOLDS_NULL(node) (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
+
#define JSON_TYPE_NODE (json_node_get_type ())
#define JSON_TYPE_OBJECT (json_object_get_type ())
#define JSON_TYPE_ARRAY (json_array_get_type ())
@@ -131,6 +182,8 @@
void json_node_free (JsonNode *node);
JsonNodeType json_node_get_node_type (JsonNode *node);
GType json_node_get_value_type (JsonNode *node);
+void json_node_set_parent (JsonNode *node,
+ JsonNode *parent);
JsonNode * json_node_get_parent (JsonNode *node);
G_CONST_RETURN gchar *json_node_type_name (JsonNode *node);
diff -r 45171459da46 -r c45607416f2c Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h Mon Jan 11 20:51:29 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h Tue Jan 12 13:21:24 2010 -0500
@@ -48,21 +48,21 @@
*
* Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MINOR_VERSION (7)
+#define JSON_MINOR_VERSION (9)
/**
* JSON_MICRO_VERSION:
*
* Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MICRO_VERSION (6)
+#define JSON_MICRO_VERSION (2)
/**
* JSON_VERSION
*
* Json version.
*/
-#define JSON_VERSION (0.7.6)
+#define JSON_VERSION (0.9.2)
/**
* JSON_VERSION_S:
@@ -70,7 +70,7 @@
* Json version, encoded as a string, useful for printing and
* concatenation.
*/
-#define JSON_VERSION_S "0.7.6"
+#define JSON_VERSION_S "0.9.2"
/**
* JSON_VERSION_HEX:
diff -r 45171459da46 -r c45607416f2c Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
diff -r 45171459da46 -r c45607416f2c Frameworks/libpurple.framework/Versions/0.6.5/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.5/libpurple has changed
More information about the commits
mailing list