diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-02-27 15:56:12 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-02-27 15:56:12 +0000 |
| commit | 0ee7170dbb56dba21e7404acc1e2151a1558e38c (patch) | |
| tree | e69515e853393a7d24cff3142bf0e4a299188754 | |
| parent | 2daf2e8e6bca403b24d8a79a02bc7d3a5006f7b4 (diff) | |
| download | clutter-0ee7170dbb56dba21e7404acc1e2151a1558e38c.tar.gz | |
Move clutter-util.h into the deprecated section
| -rw-r--r-- | clutter/Makefile.am | 4 | ||||
| -rw-r--r-- | clutter/clutter-deprecated.h | 1 | ||||
| -rw-r--r-- | clutter/clutter-util.c | 2 | ||||
| -rw-r--r-- | clutter/clutter.h | 1 | ||||
| -rw-r--r-- | clutter/deprecated/clutter-util.h (renamed from clutter/clutter-util.h) | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/clutter/Makefile.am b/clutter/Makefile.am index a15dc1739..4c942efb8 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -114,12 +114,11 @@ source_h = \ $(srcdir)/clutter-state.h \ $(srcdir)/clutter-table-layout.h \ $(srcdir)/clutter-texture.h \ - $(srcdir)/clutter-text.h \ + $(srcdir)/clutter-text.h \ $(srcdir)/clutter-text-buffer.h \ $(srcdir)/clutter-timeline.h \ $(srcdir)/clutter-types.h \ $(srcdir)/clutter-units.h \ - $(srcdir)/clutter-util.h \ $(NULL) source_c = \ @@ -258,6 +257,7 @@ deprecated_h = \ $(srcdir)/deprecated/clutter-texture.h \ $(srcdir)/deprecated/clutter-timeline.h \ $(srcdir)/deprecated/clutter-timeout-pool.h \ + $(srcdir)/deprecated/clutter-util.h \ $(NULL) # deprecated source code diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 8f6a1e0bd..44c527424 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -30,6 +30,7 @@ #include "deprecated/clutter-texture.h" #include "deprecated/clutter-timeline.h" #include "deprecated/clutter-timeout-pool.h" +#include "deprecated/clutter-util.h" #undef __CLUTTER_DEPRECATED_H_INSIDE__ diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c index 6b94d3f78..2c754a0e1 100644 --- a/clutter/clutter-util.c +++ b/clutter/clutter-util.c @@ -36,7 +36,7 @@ #include <glib/gi18n-lib.h> -#include "clutter-util.h" +#include "deprecated/clutter-util.h" #include "clutter-main.h" /** diff --git a/clutter/clutter.h b/clutter/clutter.h index 7f5d51737..eb5c7c07b 100644 --- a/clutter/clutter.h +++ b/clutter/clutter.h @@ -97,7 +97,6 @@ #include "clutter-text.h" #include "clutter-timeline.h" #include "clutter-units.h" -#include "clutter-util.h" #include "clutter-version.h" #include "clutter-enum-types.h" diff --git a/clutter/clutter-util.h b/clutter/deprecated/clutter-util.h index 26fb7d860..ff9b325df 100644 --- a/clutter/clutter-util.h +++ b/clutter/deprecated/clutter-util.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS -CLUTTER_DEPRECATED +CLUTTER_DEPRECATED_IN_1_2 gint clutter_util_next_p2 (gint a); G_END_DECLS |