adium-1.3 370:77ea66fcf4c4: Disable facebook prpl's hx, which we...

commits at adium.im commits at adium.im
Thu Aug 20 02:35:08 UTC 2009


details:	http://hg.adium.im/adium-1.3/rev/77ea66fcf4c4
revision:	370:77ea66fcf4c4
author:		Evan Schoenberg
date:		Wed Aug 19 21:22:45 2009 -0500

Disable facebook prpl's hx, which we handle on our own
Subject: adium-1.3 371:5c4802f787df: Merge

details:	http://hg.adium.im/adium-1.3/rev/5c4802f787df
revision:	371:5c4802f787df
author:		Evan Schoenberg
date:		Wed Aug 19 21:25:07 2009 -0500

Merge
Subject: adium-1.3 372:2218b367d7f8: Merge

details:	http://hg.adium.im/adium-1.3/rev/2218b367d7f8
revision:	372:2218b367d7f8
author:		Evan Schoenberg
date:		Wed Aug 19 21:39:59 2009 -0500

Merge
Subject: adium-1.3 373:feaca9408bef: Now with more actual building, I think

details:	http://hg.adium.im/adium-1.3/rev/feaca9408bef
revision:	373:feaca9408bef
author:		Evan Schoenberg
date:		Wed Aug 19 21:41:43 2009 -0500

Now with more actual building, I think

diffs (569 lines):

diff -r 78cf23a61398 -r feaca9408bef ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Wed Aug 19 21:10:17 2009 -0500
+++ b/ChangeLogs/Changes.txt	Wed Aug 19 21:41:43 2009 -0500
@@ -13,6 +13,7 @@
     * Fixed messaging with Facebook users whose user IDs are very large
     * Numerous other fixes (http://code.google.com/p/pidgin-facebookchat/wiki/Changelog)
  * Added option to control Facebook mail checking
+ * Merged down the space dust
 
 Version 1.3.5 (6/22/2009)
  * Updated to libpurple 2.5.7
diff -r 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h	Wed Aug 19 21:41:43 2009 -0500
@@ -1,6 +1,10 @@
 
 /* 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__
 
@@ -8,11 +12,11 @@
 
 G_BEGIN_DECLS
 
-/* enumerations from "../json-glib/json-parser.h" */
+/* enumerations from "/Users/evands/adium-1.3/Utilities/dep-build-scripts/source/json-glib-0.7.6/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 "../json-glib/json-types.h" */
+/* enumerations from "/Users/evands/adium-1.3/Utilities/dep-build-scripts/source/json-glib-0.7.6/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 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h	Wed Aug 19 21:41:43 2009 -0500
@@ -2,21 +2,29 @@
  * 
  * 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 of the License, or (at your option) any later version.
+ * 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 openedhand.com>
+ *   Emmanuele Bassi  <ebassi at linux.intel.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 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h	Wed Aug 19 21:41:43 2009 -0500
@@ -1,10 +1,39 @@
+/* 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 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h	Wed Aug 19 21:41:43 2009 -0500
@@ -2,19 +2,23 @@
  * 
  * 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 of the License, or (at your option) any later version.
+ * 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 openedhand.com>
+ *   Emmanuele Bassi  <ebassi at linux.intel.com>
  */
 
 #ifndef __JSON_GOBJECT_H__
diff -r 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-parser.h	Wed Aug 19 21:41:43 2009 -0500
@@ -2,21 +2,29 @@
  * 
  * 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 of the License, or (at your option) any later version.
+ * 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 openedhand.com>
+ *   Emmanuele Bassi  <ebassi at linux.intel.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 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h	Wed Aug 19 21:41:43 2009 -0500
@@ -2,21 +2,29 @@
  * 
  * 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 of the License, or (at your option) any later version.
+ * 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 openedhand.com>
+ *   Emmanuele Bassi  <ebassi at linux.intel.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__
 
@@ -30,13 +38,23 @@
  *
  * Evaluates to the #JsonNodeType contained by @node
  */
-#define JSON_NODE_TYPE(node)    (((JsonNode *) (node))->type)
+#define JSON_NODE_TYPE(node)    (json_node_get_node_type ((node)))
 
 #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
@@ -52,8 +70,6 @@
  */
 typedef struct _JsonArray       JsonArray;
 
-typedef struct _JsonNode        JsonNode;
-
 /**
  * JsonNodeType:
  * @JSON_NODE_OBJECT: The node contains a #JsonObject
@@ -71,32 +87,52 @@
 } JsonNodeType;
 
 /**
- * JsonNode:
- * @type: the type of node
+ * 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
  *
- * 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.
+ * 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
  */
-struct _JsonNode
-{
-  /*< private >*/
-  JsonNodeType type;
+typedef void (* JsonObjectForeach) (JsonObject  *object,
+                                    const gchar *member_name,
+                                    JsonNode    *member_node,
+                                    gpointer     user_data);
 
-  union {
-    JsonObject *object;
-    JsonArray *array;
-    GValue value;
-  } data;
+/**
+ * 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);
 
-  JsonNode *parent;
-};
-
+/*
+ * JsonNode
+ */
 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);
+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);
@@ -119,51 +155,127 @@
 G_CONST_RETURN gchar *json_node_get_string      (JsonNode     *node);
 gchar *               json_node_dup_string      (JsonNode     *node);
 void                  json_node_set_int         (JsonNode     *node,
-                                                 gint          value);
-gint                  json_node_get_int         (JsonNode     *node);
+                                                 gint64        value);
+gint64                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);
-JsonNode *            json_node_get_parent      (JsonNode     *node);
-G_CONST_RETURN gchar *json_node_type_name       (JsonNode     *node);
+gboolean              json_node_is_null         (JsonNode     *node);
 
-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);
+/*
+ * 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_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);
+#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);
 
 G_END_DECLS
 
diff -r 78cf23a61398 -r feaca9408bef 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	Wed Aug 19 21:10:17 2009 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h	Wed Aug 19 21:41:43 2009 -0500
@@ -2,21 +2,29 @@
  * 
  * 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 of the License, or (at your option) any later version.
+ * 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 openedhand.com>
+ *   Emmanuele Bassi  <ebassi at linux.intel.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__
 
@@ -40,21 +48,21 @@
  *
  * Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
  */
-#define JSON_MINOR_VERSION              (6)
+#define JSON_MINOR_VERSION              (7)
 
 /**
  * JSON_MICRO_VERSION:
  *
  * Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)
  */
-#define JSON_MICRO_VERSION              (2)
+#define JSON_MICRO_VERSION              (6)
 
 /**
  * JSON_VERSION
  *
  * Json version.
  */
-#define JSON_VERSION                    (0.6.2)
+#define JSON_VERSION                    (0.7.6)
 
 /**
  * JSON_VERSION_S:
@@ -62,7 +70,7 @@
  * Json version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define JSON_VERSION_S                  "0.6.2"
+#define JSON_VERSION_S                  "0.7.6"
 
 /**
  * JSON_VERSION_HEX:
diff -r 78cf23a61398 -r feaca9408bef Frameworks/libpurple.framework/Versions/0.5.9/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.5.9/libpurple has changed
diff -r 78cf23a61398 -r feaca9408bef Plugins/Purple Service/PurpleFacebookAccount.m
--- a/Plugins/Purple Service/PurpleFacebookAccount.m	Wed Aug 19 21:10:17 2009 -0500
+++ b/Plugins/Purple Service/PurpleFacebookAccount.m	Wed Aug 19 21:41:43 2009 -0500
@@ -33,6 +33,9 @@
 	 */
 	purple_account_set_bool(account, "facebook_get_notifications", FALSE);
 	
+	// We do our own history; don't let the server's history get displayed as new messages
+	purple_account_set_bool(account, "facebook_show_history", FALSE);
+
 	// Disable this for 1.3 where we don't support multiple containers.
 	purple_account_set_bool(account, "facebook_use_groups", FALSE);
 }




More information about the commits mailing list