Compilation fixes

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 5ee96a8..1ef22e6 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -35,6 +35,7 @@ LDADD = \
 
 BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES)
 
+# please, keep this sorted alphabetically
 source_h =                                     \
        $(srcdir)/clutter-actor.h               \
        $(srcdir)/clutter-alpha.h               \
@@ -126,6 +127,7 @@ clutter-enum-types.c: clutter-enum-types.h
 
 CLEANFILES = $(STAMPFILES)
 
+# please, keep this sorted alphabetically
 source_c = \
         clutter-actor.c                        \
        clutter-alpha.c                 \

diff --git a/clutter/clutter-timeout-pool.c b/clutter/clutter-timeout-pool.c
index 5aca891..d586d98 100644 (file)
--- a/clutter/clutter-timeout-pool.c
+++ b/clutter/clutter-timeout-pool.c
@@ -1,4 +1,4 @@
-v/*
+/*
  * Clutter.
  *
  * An OpenGL based 'interactive canvas' library.
@@ -32,11 +32,8 @@ v/*
 
 #include "config.h"
 
-#include "clutter-timeout-pool.h"
-
-#include "clutter-main.h"
 #include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter-timeout-pool.h"
 
 typedef struct _ClutterTimeout  ClutterTimeout;
 
@@ -342,7 +339,6 @@ clutter_timeout_pool_new (gint priority)
   pool = (ClutterTimeoutPool *) source;
   pool->next_id = 1;
   pool->id = g_source_attach (source, NULL);
-
   g_source_unref (source);
 
   return pool;

diff --git a/clutter/clutter.h b/clutter/clutter.h
index 9c2b2c3..9d3e2c8 100644 (file)
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -32,6 +32,7 @@
 #include "clutter-util.h"
 #include "clutter-event.h"
 #include "clutter-entry.h"
+#include "clutter-timeout-pool.h"
 #include "clutter-timeline.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-bspline.h"
@@ -55,7 +56,6 @@
 #include "clutter-feature.h"
 #include "clutter-version.h"
 #include "clutter-enum-types.h"
-#include "clutter-timeout-pool.h"
 #include "clutter-units.h"
 
 #endif