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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54921ce5003b40d86330745f8f1de917bf7d9cbd
-  data.tar.gz: c58776c73a69cd2cc171f46598eea4962da865d8
+  metadata.gz: 582988fbe40629a6d983702260861f4f5bc97e6e
+  data.tar.gz: b6162a5efd2c75975e3434d59b12a8907992e89b
 SHA512:
-  metadata.gz: 9eb28a224cd9f23ec95b8b22a2b7f8322145ffd2f84e6783b1da0c69a45764e881a559c75a6bff0ea18f11abd0a1d014efedcbe8cbf90aa589470baaa4eef6e6
-  data.tar.gz: f3b2c2f36026de33165427f2d2ce206455a68e181b68a7d89efc14342465b16d663b282fbecf7da269fe771f02b1edfcf9d693ae414fed9160f8aa20203b0faa
+  metadata.gz: aa5d44dff830f017116d480eb41f9c317184e022d6477968665bd74be41c1c8511f4615b070c3d540743b0324cd4607be2ae8ac6581a717668f8281b3d8c18c0
+  data.tar.gz: d4ce317abd794afbc70d823daf9a226193d9347679447a8dbc196d73992e0edd76e2b9b463c641d5a0082e27cd29c8429f1ac4449fdebf4b17712002bb504e22

data/Rakefile

@@ -81,7 +81,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "cogl",
       :download_site => :gnome,
       :label => "Cogl",
-      :version => "1.20.0",
+      :version => "1.22.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -95,7 +95,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "json-glib",
       :download_site => :gnome,
       :label => "JSON-GLib",
-      :version => "1.0.4",
+      :version => "1.2.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -112,7 +112,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "clutter",
       :download_site => :gnome,
       :label => "Clutter",
-      :version => "1.22.4",
+      :version => "1.26.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/vendor/local/include/clutter-1.0/clutter/clutter-action.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_ACTION_H__
+#define __CLUTTER_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTION_H__
-#define __CLUTTER_ACTION_H__
-
 #include <clutter/clutter-actor-meta.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-actor-meta.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_ACTOR_META_H__
+#define __CLUTTER_ACTOR_META_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTOR_META_H__
-#define __CLUTTER_ACTOR_META_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-actor.h

@@ -22,15 +22,16 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_ACTOR_H__
+#define __CLUTTER_ACTOR_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTOR_H__
-#define __CLUTTER_ACTOR_H__
-
 /* clutter-actor.h */
 
+#include <gio/gio.h>
 #include <pango/pango.h>
 #include <atk/atk.h>
 
@@ -54,8 +55,14 @@ G_BEGIN_DECLS
  * @f: the #ClutterActorFlags to set
  *
  * Sets the given flags on a #ClutterActor
+ *
+ * Deprecated: 1.24: Changing flags directly is heavily discouraged in
+ *   newly written code. #ClutterActor will take care of setting the
+ *   internal state.
  */
-#define CLUTTER_ACTOR_SET_FLAGS(a,f)    (((ClutterActor*)(a))->flags |= (f))
+#define CLUTTER_ACTOR_SET_FLAGS(a,f) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
+  (((ClutterActor*)(a))->flags |= (f))
 
 /**
  * CLUTTER_ACTOR_UNSET_FLAGS:
@@ -63,13 +70,30 @@ G_BEGIN_DECLS
  * @f: the #ClutterActorFlags to unset
  *
  * Unsets the given flags on a #ClutterActor
+ *
+ * Deprecated: 1.24: Changing flags directly is heavily discouraged in
+ *   newly written code. #ClutterActor will take care of unsetting the
+ *   internal state.
  */
-#define CLUTTER_ACTOR_UNSET_FLAGS(a,f)  (((ClutterActor*)(a))->flags &= ~(f))
+#define CLUTTER_ACTOR_UNSET_FLAGS(a,f) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
+  (((ClutterActor*)(a))->flags &= ~(f))
+
+#define CLUTTER_ACTOR_IS_MAPPED(a) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_mapped instead") \
+  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_MAPPED) != FALSE)
+
+#define CLUTTER_ACTOR_IS_REALIZED(a) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_realized instead") \
+  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REALIZED) != FALSE)
 
-#define CLUTTER_ACTOR_IS_MAPPED(a)      ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_MAPPED) != FALSE)
-#define CLUTTER_ACTOR_IS_REALIZED(a)    ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REALIZED) != FALSE)
-#define CLUTTER_ACTOR_IS_VISIBLE(a)     ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_VISIBLE) != FALSE)
-#define CLUTTER_ACTOR_IS_REACTIVE(a)    ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REACTIVE) != FALSE)
+#define CLUTTER_ACTOR_IS_VISIBLE(a) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_visible instead") \
+  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_VISIBLE) != FALSE)
+
+#define CLUTTER_ACTOR_IS_REACTIVE(a) \
+  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_get_reactive instead") \
+  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REACTIVE) != FALSE)
 
 typedef struct _ClutterActorClass    ClutterActorClass;
 typedef struct _ClutterActorPrivate  ClutterActorPrivate;
@@ -345,6 +369,13 @@ const gchar *                   clutter_actor_get_name
 CLUTTER_AVAILABLE_IN_ALL
 AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
 
+CLUTTER_AVAILABLE_IN_1_24
+gboolean                        clutter_actor_is_visible                        (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_1_24
+gboolean                        clutter_actor_is_mapped                         (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_1_24
+gboolean                        clutter_actor_is_realized                       (ClutterActor                *self);
+
 /* Size negotiation */
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_request_mode                  (ClutterActor                *self,
@@ -836,6 +867,38 @@ CLUTTER_AVAILABLE_IN_1_22
 gint                            clutter_actor_get_opacity_override              (ClutterActor               *self);
 #endif
 
+/**
+ * ClutterActorCreateChildFunc:
+ * @item: (type GObject): the item in the model
+ * @user_data: Data passed to clutter_actor_bind_model()
+ *
+ * Creates a #ClutterActor using the @item in the model.
+ *
+ * The usual way to implement this function is to create a #ClutterActor
+ * instance and then bind the #GObject properties to the actor properties
+ * of interest, using g_object_bind_property(). This way, when the @item
+ * in the #GListModel changes, the #ClutterActor changes as well.
+ *
+ * Returns: (transfer full): The newly created child #ClutterActor
+ *
+ * Since: 1.24
+ */
+typedef ClutterActor * (* ClutterActorCreateChildFunc) (gpointer item,
+                                                        gpointer user_data);
+
+CLUTTER_AVAILABLE_IN_1_24
+void                            clutter_actor_bind_model                        (ClutterActor               *self,
+                                                                                 GListModel                 *model,
+                                                                                 ClutterActorCreateChildFunc create_child_func,
+                                                                                 gpointer                    user_data,
+                                                                                 GDestroyNotify              notify);
+CLUTTER_AVAILABLE_IN_1_24
+void                            clutter_actor_bind_model_with_properties        (ClutterActor               *self,
+                                                                                 GListModel                 *model,
+                                                                                 GType                       child_type,
+                                                                                 const char                 *first_model_property,
+                                                                                 ...);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_ACTOR_H__ */

data/vendor/local/include/clutter-1.0/clutter/clutter-align-constraint.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_ALIGN_CONSTRAINT_H__
+#define __CLUTTER_ALIGN_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ALIGN_CONSTRAINT_H__
-#define __CLUTTER_ALIGN_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-autocleanups.h

@@ -0,0 +1,106 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright 2015  Emmanuele Bassi
+ *
+ * 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.
+ *
+ * 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/>.
+ *
+ *
+ */
+
+#ifndef __CLUTTER_AUTO_CLEANUPS_H__
+#define __CLUTTER_AUTO_CLEANUPS_H__
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __GI_SCANNER__
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActor, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorMeta, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAlignConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAnimatable, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackend, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindingPool, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBinLayout, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBlurEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBoxLayout, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterCanvas, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterChildMeta, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClickAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContainer, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContent, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeviceManager, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDragAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDropAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFixedLayout, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFlowLayout, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterGestureAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterGridLayout, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterImage, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInputDevice, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInterval, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterKeyframeTransition, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterLayoutManager, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterLayoutMeta, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterOffscreenEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPageTurnEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPanAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPath, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPropertyTransition, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterRotateAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScriptable, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScript, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScrollActor, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSettings, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterShaderEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSnapConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterStage, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSwipeAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTapAction, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTextBuffer, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterText, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTimeline, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTransitionGroup, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTransition, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterZoomAction, g_object_unref)
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorBox, clutter_actor_box_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColor, clutter_color_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMargin, clutter_margin_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMatrix, clutter_matrix_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintNode, clutter_paint_node_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathNode, clutter_path_node_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPoint, clutter_point_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterRect, clutter_rect_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSize, clutter_size_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterVertex, clutter_vertex_free)
+
+#endif /* __GI_SCANNER__ */
+
+#endif /* __CLUTTER_AUTO_CLEANUPS_H__ */

data/vendor/local/include/clutter-1.0/clutter/clutter-backend.h

@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_BACKEND_H__
+#define __CLUTTER_BACKEND_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BACKEND_H__
-#define __CLUTTER_BACKEND_H__
-
 #include <cairo.h>
 #include <pango/pango.h>
 

data/vendor/local/include/clutter-1.0/clutter/clutter-bin-layout.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_BIN_LAYOUT_H__
+#define __CLUTTER_BIN_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BIN_LAYOUT_H__
-#define __CLUTTER_BIN_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-bind-constraint.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_BIND_CONSTRAINT_H__
+#define __CLUTTER_BIND_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BIND_CONSTRAINT_H__
-#define __CLUTTER_BIND_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-binding-pool.h

@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_BINDING_POOL_H__
+#define __CLUTTER_BINDING_POOL_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BINDING_POOL_H__
-#define __CLUTTER_BINDING_POOL_H__
-
 #include <glib-object.h>
 #include <clutter/clutter-event.h>
 

data/vendor/local/include/clutter-1.0/clutter/clutter-blur-effect.h

@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __CLUTTER_BLUR_EFFECT_H__
+#define __CLUTTER_BLUR_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BLUR_EFFECT_H__
-#define __CLUTTER_BLUR_EFFECT_H__
-
 #include <clutter/clutter-effect.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-box-layout.h

@@ -25,13 +25,13 @@
  *   Thomas Wood <thomas.wood@intel.com>
  */
 
+#ifndef __CLUTTER_BOX_LAYOUT_H__
+#define __CLUTTER_BOX_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BOX_LAYOUT_H__
-#define __CLUTTER_BOX_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-brightness-contrast-effect.h

@@ -22,13 +22,13 @@
  *   Joseph Scheuhammer <clown@alum.mit.edu>
  */
 
+#ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
+#define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
-#define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
-
 #include <clutter/clutter-color.h>
 #include <clutter/clutter-effect.h>