clutter 3.0.7-x86-mingw32 → 3.0.8-x86-mingw32

data/vendor/local/include/clutter-1.0/clutter/{clutter-list-model.h → deprecated/clutter-list-model.h}

@@ -32,7 +32,7 @@
 #ifndef __CLUTTER_LIST_MODEL_H__
 #define __CLUTTER_LIST_MODEL_H__
 
-#include <clutter/clutter-model.h>
+#include <clutter/deprecated/clutter-model.h>
 
 G_BEGIN_DECLS
 
@@ -53,6 +53,8 @@ typedef struct _ClutterListModelClass           ClutterListModelClass;
  * The #ClutterListModel struct contains only private data.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
  */
 struct _ClutterListModel
 {
@@ -68,6 +70,8 @@ struct _ClutterListModel
  * The #ClutterListModelClass struct contains only private data.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListStore instead
  */
 struct _ClutterListModelClass
 {
@@ -75,13 +79,13 @@ struct _ClutterListModelClass
   ClutterModelClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_get_type)
 GType         clutter_list_model_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new)
 ClutterModel *clutter_list_model_new      (guint                n_columns,
                                               ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new)
 ClutterModel *clutter_list_model_newv     (guint                n_columns,
                                            GType               *types,
                                            const gchar * const  names[]);

data/vendor/local/include/clutter-1.0/clutter/{clutter-model.h → deprecated/clutter-model.h}

@@ -60,6 +60,8 @@ typedef struct _ClutterModelIterPrivate ClutterModelIterPrivate;
  * Return value: If the row should be displayed, return %TRUE
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Implement filters using a custom #GListModel instead
  */
 typedef gboolean (*ClutterModelFilterFunc) (ClutterModel     *model,
                                             ClutterModelIter *iter,
@@ -78,6 +80,8 @@ typedef gboolean (*ClutterModelFilterFunc) (ClutterModel     *model,
  *   @a is before @b, or 0 if the rows are the same
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Implement sorting using a custom #GListModel instead
  */
 typedef gint (*ClutterModelSortFunc) (ClutterModel *model,
                                       const GValue *a,
@@ -95,6 +99,8 @@ typedef gint (*ClutterModelSortFunc) (ClutterModel *model,
  * Return value: %TRUE if the iteration should continue, %FALSE otherwise
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel
  */
 typedef gboolean (*ClutterModelForeachFunc) (ClutterModel     *model,
                                              ClutterModelIter *iter,
@@ -108,6 +114,8 @@ typedef gboolean (*ClutterModelForeachFunc) (ClutterModel     *model,
  * API.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel instead
  */
 struct _ClutterModel
 {
@@ -142,6 +150,8 @@ struct _ClutterModel
  * Class for #ClutterModel instances.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use #GListModel instead
  */
 struct _ClutterModelClass 
 {
@@ -188,102 +198,102 @@ struct _ClutterModelClass
   void (*_clutter_model_8) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_model_get_type)
 GType                 clutter_model_get_type           (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_set_types          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         GType            *types);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_set_names          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         const gchar * const names[]);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_append             (ClutterModel     *model,
                                                         ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_appendv            (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_prepend            (ClutterModel     *model,
                                                         ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_prependv           (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_insert             (ClutterModel     *model,
                                                         guint             row,
                                                         ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_insertv            (ClutterModel     *model,
                                                         guint             row,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_insert_value       (ClutterModel     *model,
                                                         guint             row,
                                                         guint             column,
                                                         const GValue     *value);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_remove             (ClutterModel     *model,
                                                         guint             row);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 guint                 clutter_model_get_n_rows         (ClutterModel     *model);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 guint                 clutter_model_get_n_columns      (ClutterModel     *model);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 const gchar *         clutter_model_get_column_name    (ClutterModel     *model,
                                                         guint             column);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 GType                 clutter_model_get_column_type    (ClutterModel     *model,
                                                         guint             column);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_first_iter     (ClutterModel     *model);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_last_iter      (ClutterModel     *model);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_iter_at_row    (ClutterModel     *model,
                                                         guint             row);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_set_sorting_column (ClutterModel     *model,
                                                         gint              column);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 gint                  clutter_model_get_sorting_column (ClutterModel     *model);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_foreach            (ClutterModel     *model,
                                                         ClutterModelForeachFunc func, 
                                                         gpointer          user_data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_set_sort           (ClutterModel     *model, 
                                                         gint              column,
                                                         ClutterModelSortFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_set_filter         (ClutterModel     *model, 
                                                         ClutterModelFilterFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 gboolean              clutter_model_get_filter_set     (ClutterModel     *model);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 void                  clutter_model_resort             (ClutterModel     *model);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 gboolean              clutter_model_filter_row         (ClutterModel     *model,
                                                         guint             row);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
 gboolean              clutter_model_filter_iter        (ClutterModel     *model,
                                                         ClutterModelIter *iter);
 
@@ -306,6 +316,8 @@ gboolean              clutter_model_filter_iter        (ClutterModel     *model,
  * provided API.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use custom iterators for #GListModel
  */
 struct _ClutterModelIter
 {
@@ -338,6 +350,8 @@ struct _ClutterModelIter
  * Class for #ClutterModelIter instances.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.24: Use custom iterators for #GListModel
  */
 struct _ClutterModelIterClass 
 {
@@ -376,45 +390,45 @@ struct _ClutterModelIterClass
   void (*_clutter_model_iter_8) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 GType             clutter_model_iter_get_type   (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_get        (ClutterModelIter *iter,
                                                  ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_get_valist (ClutterModelIter *iter,
                                                  va_list          args);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_get_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  GValue           *value);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_set        (ClutterModelIter *iter,
                                                  ...);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_set_valist (ClutterModelIter *iter,
                                                  va_list          args);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 void              clutter_model_iter_set_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  const GValue     *value);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 gboolean          clutter_model_iter_is_first   (ClutterModelIter *iter);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 gboolean          clutter_model_iter_is_last    (ClutterModelIter *iter);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 ClutterModelIter *clutter_model_iter_next       (ClutterModelIter *iter);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 ClutterModelIter *clutter_model_iter_prev       (ClutterModelIter *iter);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 ClutterModel *    clutter_model_iter_get_model  (ClutterModelIter *iter);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 guint             clutter_model_iter_get_row    (ClutterModelIter *iter);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_DEPRECATED_IN_1_24
 ClutterModelIter *clutter_model_iter_copy       (ClutterModelIter *iter);
 
 G_END_DECLS

data/vendor/local/include/cogl/cogl/cogl-defines.h

@@ -51,8 +51,8 @@
 #define COGL_HAS_WIN32_SUPPORT 1
 
 #define COGL_VERSION_MAJOR_INTERNAL 1
-#define COGL_VERSION_MINOR_INTERNAL 20
+#define COGL_VERSION_MINOR_INTERNAL 22
 #define COGL_VERSION_MICRO_INTERNAL 0
-#define COGL_VERSION_STRING_INTERNAL "1.20.0"
+#define COGL_VERSION_STRING_INTERNAL "1.22.0"
 
 #endif

data/vendor/local/include/json-glib-1.0/json-glib/json-builder.h

@@ -80,6 +80,8 @@ GType json_builder_get_type (void) G_GNUC_CONST;
 
 JSON_AVAILABLE_IN_1_0
 JsonBuilder *json_builder_new                (void);
+JSON_AVAILABLE_IN_1_2
+JsonBuilder *json_builder_new_immutable      (void);
 JSON_AVAILABLE_IN_1_0
 JsonNode    *json_builder_get_root           (JsonBuilder  *builder);
 JSON_AVAILABLE_IN_1_0
@@ -115,6 +117,10 @@ JsonBuilder *json_builder_add_string_value   (JsonBuilder  *builder,
 JSON_AVAILABLE_IN_1_0
 JsonBuilder *json_builder_add_null_value     (JsonBuilder  *builder);
 
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonBuilder, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __JSON_BUILDER_H__ */

data/vendor/local/include/json-glib-1.0/json-glib/json-generator.h

@@ -115,6 +115,10 @@ gboolean        json_generator_to_stream        (JsonGenerator  *generator,
                                                  GCancellable   *cancellable,
                                                  GError        **error);
 
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonGenerator, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __JSON_GENERATOR_H__ */

data/vendor/local/include/json-glib-1.0/json-glib/json-glib.h

@@ -33,6 +33,7 @@
 #include <json-glib/json-parser.h>
 #include <json-glib/json-path.h>
 #include <json-glib/json-reader.h>
+#include <json-glib/json-utils.h>
 #include <json-glib/json-version.h>
 #include <json-glib/json-version-macros.h>
 

data/vendor/local/include/json-glib-1.0/json-glib/json-parser.h

@@ -147,6 +147,8 @@ GType json_parser_get_type (void) G_GNUC_CONST;
 
 JSON_AVAILABLE_IN_1_0
 JsonParser *json_parser_new                     (void);
+JSON_AVAILABLE_IN_1_2
+JsonParser *json_parser_new_immutable           (void);
 JSON_AVAILABLE_IN_1_0
 gboolean    json_parser_load_from_file          (JsonParser           *parser,
                                                  const gchar          *filename,
@@ -183,6 +185,10 @@ JSON_AVAILABLE_IN_1_0
 gboolean    json_parser_has_assignment          (JsonParser           *parser,
                                                  gchar               **variable_name);
 
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonParser, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __JSON_PARSER_H__ */

data/vendor/local/include/json-glib-1.0/json-glib/json-path.h

@@ -97,6 +97,10 @@ JsonNode *      json_path_query         (const char  *expression,
                                          JsonNode    *root,
                                          GError     **error);
 
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonPath, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __JSON_PATH_H__ */

data/vendor/local/include/json-glib-1.0/json-glib/json-reader.h

@@ -166,6 +166,10 @@ gboolean               json_reader_get_boolean_value (JsonReader   *reader);
 JSON_AVAILABLE_IN_1_0
 gboolean               json_reader_get_null_value    (JsonReader   *reader);
 
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonReader, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __JSON_READER_H__ */

data/vendor/local/include/json-glib-1.0/json-glib/json-types.h

@@ -213,6 +213,11 @@ JsonNode *            json_node_copy            (JsonNode     *node);
 JSON_AVAILABLE_IN_1_0
 void                  json_node_free            (JsonNode     *node);
 
+JSON_AVAILABLE_IN_1_2
+JsonNode *            json_node_ref             (JsonNode     *node);
+JSON_AVAILABLE_IN_1_2
+void                  json_node_unref           (JsonNode     *node);
+
 JSON_AVAILABLE_IN_1_0
 JsonNodeType          json_node_get_node_type   (JsonNode     *node);
 JSON_AVAILABLE_IN_1_0
@@ -276,6 +281,25 @@ gboolean              json_node_get_boolean     (JsonNode     *node);
 JSON_AVAILABLE_IN_1_0
 gboolean              json_node_is_null         (JsonNode     *node);
 
+JSON_AVAILABLE_IN_1_2
+void                  json_node_seal            (JsonNode     *node);
+gboolean              json_node_is_immutable    (JsonNode     *node);
+
+JSON_AVAILABLE_IN_1_2
+guint                 json_string_hash            (gconstpointer  key);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_string_equal           (gconstpointer  a,
+                                                   gconstpointer  b);
+JSON_AVAILABLE_IN_1_2
+gint                  json_string_compare         (gconstpointer  a,
+                                                   gconstpointer  b);
+
+JSON_AVAILABLE_IN_1_2
+guint                 json_node_hash              (gconstpointer  key);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_node_equal             (gconstpointer  a,
+                                                   gconstpointer  b);
+
 /*
  * JsonObject
  */
@@ -368,6 +392,45 @@ void                  json_object_foreach_member     (JsonObject  *object,
                                                       JsonObjectForeach func,
                                                       gpointer     data);
 
+JSON_AVAILABLE_IN_1_2
+void                  json_object_seal               (JsonObject  *object);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_object_is_immutable       (JsonObject  *object);
+
+JSON_AVAILABLE_IN_1_2
+guint                 json_object_hash               (gconstpointer key);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_object_equal              (gconstpointer a,
+                                                      gconstpointer b);
+
+/**
+ * JsonObjectIter:
+ *
+ * An iterator used to iterate over the members of a #JsonObject. This must
+ * be allocated on the stack and initialised using json_object_iter_init().
+ * The order in which members are returned by the iterator is undefined. The
+ * iterator is invalidated if its #JsonObject is modified during iteration.
+ *
+ * All the fields in the #JsonObjectIter structure are private and should
+ * never be accessed directly.
+ *
+ * Since: 1.2 
+ */
+typedef struct {
+  /*< private >*/
+  gpointer priv_pointer[6];
+  int      priv_int[2];
+  gboolean priv_boolean[1];
+} JsonObjectIter;
+
+JSON_AVAILABLE_IN_1_2
+void                  json_object_iter_init          (JsonObjectIter  *iter,
+                                                      JsonObject      *object);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_object_iter_next          (JsonObjectIter  *iter,
+                                                      const gchar    **member_name,
+                                                      JsonNode       **member_node);
+
 JSON_AVAILABLE_IN_1_0
 GType                 json_array_get_type            (void) G_GNUC_CONST;
 JSON_AVAILABLE_IN_1_0
@@ -439,6 +502,22 @@ JSON_AVAILABLE_IN_1_0
 void                  json_array_foreach_element     (JsonArray   *array,
                                                       JsonArrayForeach func,
                                                       gpointer     data);
+JSON_AVAILABLE_IN_1_2
+void                  json_array_seal                (JsonArray   *array);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_array_is_immutable        (JsonArray   *array);
+
+JSON_AVAILABLE_IN_1_2
+guint                 json_array_hash                (gconstpointer key);
+JSON_AVAILABLE_IN_1_2
+gboolean              json_array_equal               (gconstpointer a,
+                                                      gconstpointer b);
+
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonArray, json_array_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonObject, json_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonNode, json_node_free)
+#endif
 
 G_END_DECLS