From 96440acffec37d11717a98dc140219a36cf39483 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 8 Jul 2011 12:08:19 +0100
Subject: [PATCH] texture: Deprecate the new_from_actor() function

Now that we have proper offscreen and shader handling using the
ClutterEffect API, we can finally deprecate this hard to bind, easy
to break function.
---
 clutter/clutter-texture.c        | 4 ++++
 clutter/clutter-texture.h        | 4 ++++
 tests/conform/test-texture-fbo.c | 1 +
 tests/interactive/test-fbo.c     | 1 +
 4 files changed, 10 insertions(+)

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index b55160f09..125e085bd 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -2541,6 +2541,10 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
  *
  * Return value: A newly created #ClutterTexture object, or %NULL on failure.
  *
+ * Deprecated: 1.8: Use the #ClutterOffscreenEffect and #ClutterShaderEffect
+ *   directly on the intended #ClutterActor to replace the functionality of
+ *   this function.
+ *
  * Since: 0.6
  */
 ClutterActor *
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h
index 4340c437f..530e270f8 100644
--- a/clutter/clutter-texture.h
+++ b/clutter/clutter-texture.h
@@ -166,7 +166,11 @@ GType clutter_texture_get_type (void) G_GNUC_CONST;
 ClutterActor *       clutter_texture_new                    (void);
 ClutterActor *       clutter_texture_new_from_file          (const gchar            *filename,
                                                              GError                **error);
+
+#ifndef CLUTTER_DISABLE_DEPRECATED
 ClutterActor *       clutter_texture_new_from_actor         (ClutterActor           *actor);
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 gboolean             clutter_texture_set_from_file          (ClutterTexture         *texture,
                                                              const gchar            *filename,
                                                              GError                **error);
diff --git a/tests/conform/test-texture-fbo.c b/tests/conform/test-texture-fbo.c
index c4a381958..9ec82cbee 100644
--- a/tests/conform/test-texture-fbo.c
+++ b/tests/conform/test-texture-fbo.c
@@ -1,3 +1,4 @@
+#undef CLUTTER_DISABLE_DEPRECATED
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
diff --git a/tests/interactive/test-fbo.c b/tests/interactive/test-fbo.c
index 41bffa8b6..115063bdc 100644
--- a/tests/interactive/test-fbo.c
+++ b/tests/interactive/test-fbo.c
@@ -1,3 +1,4 @@
+#undef CLUTTER_DISABLE_DEPRECATED
 
 #include <clutter/clutter.h>