adium 2932:0923d4325af7: im.pidgin.adium at 275309df32cc8e9f9175...
commits at adium.im
commits at adium.im
Sun Nov 22 19:22:58 UTC 2009
details: http://hg.adium.im/adium/rev/0923d4325af7
revision: 2932:0923d4325af7
author: Evan Schoenberg
date: Sun Nov 22 13:08:49 2009 -0600
im.pidgin.adium at 275309df32cc8e9f917529073caa4729aaa7d5a3, which has the collaborative efforts of Zac and I fixing AIM Direct IM Unicode support as well as current im.pidgin.pidgin at nearly 2.6.4.
diffs (708 lines):
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase
Binary file Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight
Binary file Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces
Binary file Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsselector.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsselector.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstadder.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstadder.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstapp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstapp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstaudioconvert.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudioconvert.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstequalizer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstequalizer.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstflxdec.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstflxdec.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstgdp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstgdp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstnice.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnice.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstudp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstudp.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstwavenc.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstwavenc.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgstwavparse.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstwavparse.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/PlugIns/libgsty4menc.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsty4menc.so has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer
Binary file Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 4f11c157f88b -r 0923d4325af7 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 Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Sun Nov 22 13:08:49 2009 -0600
@@ -1,10 +1,6 @@
/* Generated data (by glib-mkenums) */
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
#ifndef __JSON_ENUM_TYPES_H__
#define __JSON_ENUM_TYPES_H__
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h Sun Nov 22 13:08:49 2009 -0600
@@ -2,29 +2,21 @@
*
* This file is part of JSON-GLib
* Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
* Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
+ * Emmanuele Bassi <ebassi at openedhand.com>
*/
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
#ifndef __JSON_GENERATOR_H__
#define __JSON_GENERATOR_H__
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h Sun Nov 22 13:08:49 2009 -0600
@@ -1,39 +1,10 @@
-/* json-glib.h: Main header
- *
- * This file is part of JSON-GLib
- * Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
- */
-
#ifndef __JSON_GLIB_H__
#define __JSON_GLIB_H__
-#define __JSON_GLIB_INSIDE__
-
#include <json-glib/json-types.h>
#include <json-glib/json-generator.h>
#include <json-glib/json-parser.h>
#include <json-glib/json-version.h>
#include <json-glib/json-enum-types.h>
-#include <json-glib/json-gobject.h>
-
-#undef __JSON_GLIB_INSIDE__
-
#endif /* __JSON_GLIB_H__ */
diff -r 4f11c157f88b -r 0923d4325af7 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 Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h Sun Nov 22 13:08:49 2009 -0600
@@ -2,23 +2,19 @@
*
* This file is part of JSON-GLib
* Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
* Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
+ * Emmanuele Bassi <ebassi at openedhand.com>
*/
#ifndef __JSON_GOBJECT_H__
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-parser.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-parser.h Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-parser.h Sun Nov 22 13:08:49 2009 -0600
@@ -2,29 +2,21 @@
*
* This file is part of JSON-GLib
* Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
* Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
+ * Emmanuele Bassi <ebassi at openedhand.com>
*/
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
#ifndef __JSON_PARSER_H__
#define __JSON_PARSER_H__
diff -r 4f11c157f88b -r 0923d4325af7 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 Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h Sun Nov 22 13:08:49 2009 -0600
@@ -2,29 +2,21 @@
*
* This file is part of JSON-GLib
* Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
* Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
+ * Emmanuele Bassi <ebassi at openedhand.com>
*/
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
#ifndef __JSON_TYPES_H__
#define __JSON_TYPES_H__
@@ -38,23 +30,13 @@
*
* Evaluates to the #JsonNodeType contained by @node
*/
-#define JSON_NODE_TYPE(node) (json_node_get_node_type ((node)))
+#define JSON_NODE_TYPE(node) (((JsonNode *) (node))->type)
#define JSON_TYPE_NODE (json_node_get_type ())
#define JSON_TYPE_OBJECT (json_object_get_type ())
#define JSON_TYPE_ARRAY (json_array_get_type ())
/**
- * JsonNode:
- * @type: the type of node
- *
- * A generic container of JSON data types. The contents of the #JsonNode
- * structure are private and should only be accessed via the provided
- * functions and never directly.
- */
-typedef struct _JsonNode JsonNode;
-
-/**
* JsonObject:
*
* A JSON object type. The contents of the #JsonObject structure are private
@@ -70,6 +52,8 @@
*/
typedef struct _JsonArray JsonArray;
+typedef struct _JsonNode JsonNode;
+
/**
* JsonNodeType:
* @JSON_NODE_OBJECT: The node contains a #JsonObject
@@ -87,54 +71,32 @@
} JsonNodeType;
/**
- * JsonObjectForeach:
- * @object: the iterated #JsonObject
- * @member_name: the name of the member
- * @member_node: a #JsonNode containing the @member_name value
- * @user_data: data passed to the function
+ * JsonNode:
+ * @type: the type of node
*
- * The function to be passed to json_object_foreach_member(). You
- * should not add or remove members to and from @object within
- * this function. It is safe to change the value of @member_node.
- *
- * Since: 0.8
+ * A generic container of JSON data types. The contents of the #JsonNode
+ * structure are private and should only be accessed via the provided
+ * functions and never directly.
*/
-typedef void (* JsonObjectForeach) (JsonObject *object,
- const gchar *member_name,
- JsonNode *member_node,
- gpointer user_data);
+struct _JsonNode
+{
+ /*< private >*/
+ JsonNodeType type;
-/**
- * JsonArrayForeach:
- * @array: the iterated #JsonArray
- * @index_: the index of the element
- * @element_node: a #JsonNode containing the value at @index_
- * @user_data: data passed to the function
- *
- * The function to be passed to json_array_foreach_element(). You
- * should not add or remove elements to and from @array within
- * this function. It is safe to change the value of @element_node.
- *
- * Since: 0.8
- */
-typedef void (* JsonArrayForeach) (JsonArray *array,
- guint index_,
- JsonNode *element_node,
- gpointer user_data);
+ union {
+ JsonObject *object;
+ JsonArray *array;
+ GValue value;
+ } data;
-/*
- * JsonNode
- */
+ JsonNode *parent;
+};
+
GType json_node_get_type (void) G_GNUC_CONST;
JsonNode * json_node_new (JsonNodeType type);
JsonNode * json_node_copy (JsonNode *node);
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);
void json_node_set_object (JsonNode *node,
JsonObject *object);
@@ -157,127 +119,51 @@
G_CONST_RETURN gchar *json_node_get_string (JsonNode *node);
gchar * json_node_dup_string (JsonNode *node);
void json_node_set_int (JsonNode *node,
- gint64 value);
-gint64 json_node_get_int (JsonNode *node);
+ gint value);
+gint json_node_get_int (JsonNode *node);
void json_node_set_double (JsonNode *node,
gdouble value);
gdouble json_node_get_double (JsonNode *node);
void json_node_set_boolean (JsonNode *node,
gboolean value);
gboolean json_node_get_boolean (JsonNode *node);
-gboolean json_node_is_null (JsonNode *node);
+JsonNode * json_node_get_parent (JsonNode *node);
+G_CONST_RETURN gchar *json_node_type_name (JsonNode *node);
-/*
- * JsonObject
- */
-GType json_object_get_type (void) G_GNUC_CONST;
-JsonObject * json_object_new (void);
-JsonObject * json_object_ref (JsonObject *object);
-void json_object_unref (JsonObject *object);
+GType json_object_get_type (void) G_GNUC_CONST;
+JsonObject * json_object_new (void);
+JsonObject * json_object_ref (JsonObject *object);
+void json_object_unref (JsonObject *object);
+void json_object_add_member (JsonObject *object,
+ const gchar *member_name,
+ JsonNode *node);
+GList * json_object_get_members (JsonObject *object);
+JsonNode * json_object_get_member (JsonObject *object,
+ const gchar *member_name);
+JsonNode * json_object_dup_member (JsonObject *object,
+ const gchar *member_name);
+gboolean json_object_has_member (JsonObject *object,
+ const gchar *member_name);
+void json_object_remove_member (JsonObject *object,
+ const gchar *member_name);
+GList * json_object_get_values (JsonObject *object);
+guint json_object_get_size (JsonObject *object);
-#ifndef JSON_DISABLE_DEPRECATED
-void json_object_add_member (JsonObject *object,
- const gchar *member_name,
- JsonNode *node) G_GNUC_DEPRECATED;
-#endif /* JSON_DISABLE_DEPRECATED */
-
-void json_object_set_member (JsonObject *object,
- const gchar *member_name,
- JsonNode *node);
-void json_object_set_int_member (JsonObject *object,
- const gchar *member_name,
- gint64 value);
-void json_object_set_double_member (JsonObject *object,
- const gchar *member_name,
- gdouble value);
-void json_object_set_boolean_member (JsonObject *object,
- const gchar *member_name,
- gboolean value);
-void json_object_set_string_member (JsonObject *object,
- const gchar *member_name,
- const gchar *value);
-void json_object_set_null_member (JsonObject *object,
- const gchar *member_name);
-void json_object_set_array_member (JsonObject *object,
- const gchar *member_name,
- JsonArray *value);
-void json_object_set_object_member (JsonObject *object,
- const gchar *member_name,
- JsonObject *value);
-GList * json_object_get_members (JsonObject *object);
-JsonNode * json_object_get_member (JsonObject *object,
- const gchar *member_name);
-JsonNode * json_object_dup_member (JsonObject *object,
- const gchar *member_name);
-gint64 json_object_get_int_member (JsonObject *object,
- const gchar *member_name);
-gdouble json_object_get_double_member (JsonObject *object,
- const gchar *member_name);
-gboolean json_object_get_boolean_member (JsonObject *object,
- const gchar *member_name);
-G_CONST_RETURN gchar *json_object_get_string_member (JsonObject *object,
- const gchar *member_name);
-gboolean json_object_get_null_member (JsonObject *object,
- const gchar *member_name);
-JsonArray * json_object_get_array_member (JsonObject *object,
- const gchar *member_name);
-JsonObject * json_object_get_object_member (JsonObject *object,
- const gchar *member_name);
-gboolean json_object_has_member (JsonObject *object,
- const gchar *member_name);
-void json_object_remove_member (JsonObject *object,
- const gchar *member_name);
-GList * json_object_get_values (JsonObject *object);
-guint json_object_get_size (JsonObject *object);
-void json_object_foreach_member (JsonObject *object,
- JsonObjectForeach func,
- gpointer data);
-
-GType json_array_get_type (void) G_GNUC_CONST;
-JsonArray * json_array_new (void);
-JsonArray * json_array_sized_new (guint n_elements);
-JsonArray * json_array_ref (JsonArray *array);
-void json_array_unref (JsonArray *array);
-void json_array_add_element (JsonArray *array,
- JsonNode *node);
-void json_array_add_int_element (JsonArray *array,
- gint64 value);
-void json_array_add_double_element (JsonArray *array,
- gdouble value);
-void json_array_add_boolean_element (JsonArray *array,
- gboolean value);
-void json_array_add_string_element (JsonArray *array,
- const gchar *value);
-void json_array_add_null_element (JsonArray *array);
-void json_array_add_array_element (JsonArray *array,
- JsonArray *value);
-void json_array_add_object_element (JsonArray *array,
- JsonObject *value);
-GList * json_array_get_elements (JsonArray *array);
-JsonNode * json_array_get_element (JsonArray *array,
- guint index_);
-gint64 json_array_get_int_element (JsonArray *array,
- guint index_);
-gdouble json_array_get_double_element (JsonArray *array,
- guint index_);
-gboolean json_array_get_boolean_element (JsonArray *array,
- guint index_);
-G_CONST_RETURN gchar *json_array_get_string_element (JsonArray *array,
- guint index_);
-gboolean json_array_get_null_element (JsonArray *array,
- guint index_);
-JsonArray * json_array_get_array_element (JsonArray *array,
- guint index_);
-JsonObject * json_array_get_object_element (JsonArray *array,
- guint index_);
-JsonNode * json_array_dup_element (JsonArray *array,
- guint index_);
-void json_array_remove_element (JsonArray *array,
- guint index_);
-guint json_array_get_length (JsonArray *array);
-void json_array_foreach_element (JsonArray *array,
- JsonArrayForeach func,
- gpointer data);
+GType json_array_get_type (void) G_GNUC_CONST;
+JsonArray * json_array_new (void);
+JsonArray * json_array_sized_new (guint n_elements);
+JsonArray * json_array_ref (JsonArray *array);
+void json_array_unref (JsonArray *array);
+void json_array_add_element (JsonArray *array,
+ JsonNode *node);
+GList * json_array_get_elements (JsonArray *array);
+JsonNode * json_array_get_element (JsonArray *array,
+ guint index_);
+JsonNode * json_array_dup_element (JsonArray *array,
+ guint index_);
+void json_array_remove_element (JsonArray *array,
+ guint index_);
+guint json_array_get_length (JsonArray *array);
G_END_DECLS
diff -r 4f11c157f88b -r 0923d4325af7 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 Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h Sun Nov 22 13:08:49 2009 -0600
@@ -2,29 +2,21 @@
*
* This file is part of JSON-GLib
* Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
* Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
+ * Emmanuele Bassi <ebassi at openedhand.com>
*/
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
#ifndef __JSON_VERSION_H__
#define __JSON_VERSION_H__
@@ -48,7 +40,7 @@
*
* Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MINOR_VERSION (8)
+#define JSON_MINOR_VERSION (6)
/**
* JSON_MICRO_VERSION:
@@ -62,7 +54,7 @@
*
* Json version.
*/
-#define JSON_VERSION (0.8.2)
+#define JSON_VERSION (0.6.2)
/**
* JSON_VERSION_S:
@@ -70,7 +62,7 @@
* Json version, encoded as a string, useful for printing and
* concatenation.
*/
-#define JSON_VERSION_S "0.8.2"
+#define JSON_VERSION_S "0.6.2"
/**
* JSON_VERSION_HEX:
diff -r 4f11c157f88b -r 0923d4325af7 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 4f11c157f88b -r 0923d4325af7 Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Headers/buddy.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/buddy.h Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/buddy.h Sun Nov 22 13:08:49 2009 -0600
@@ -123,6 +123,7 @@
void jabber_vcard_fetch_mine(JabberStream *js);
+gboolean jabber_resource_know_capabilities(const JabberBuddyResource *jbr);
gboolean jabber_resource_has_capability(const JabberBuddyResource *jbr,
const gchar *cap);
gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap);
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h Sun Nov 22 14:01:26 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h Sun Nov 22 13:08:49 2009 -0600
@@ -368,6 +368,7 @@
gboolean jabber_initiate_media(PurpleAccount *account, const char *who,
PurpleMediaSessionType type);
PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
+gboolean jabber_can_receive_file(PurpleConnection *gc, const gchar *who);
void jabber_register_commands(void);
void jabber_unregister_commands(void);
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/ca/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/ca/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/cs/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/cs/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/da/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/da/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/de/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/de/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/el/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/el/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_AU/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_AU/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_CA/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_CA/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_GB/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/en_GB/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/es/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/es/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/fi/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/fi/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/fr/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/fr/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/hu/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/hu/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/it/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/it/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/ja/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/ja/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/nb/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/nb/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/nl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/nl/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/pl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/pl/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/pt/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/pt/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/pt_BR/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/pt_BR/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/ru/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/ru/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/sl/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/sl/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/sv/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/sv/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/tr/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/tr/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/uk/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/uk/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_CN/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_CN/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_TW/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_TW/LC_MESSAGES/pidgin.mo has changed
diff -r 4f11c157f88b -r 0923d4325af7 Frameworks/libpurple.framework/Versions/0.6.4/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.4/libpurple has changed
More information about the commits
mailing list