From f6cfee60a9fce38ea7724bed6ad1c414d8531f7e Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Thu, 1 May 2008 15:49:57 +0000
Subject: [PATCH] 2008-05-01  Emmanuele Bassi  <ebassi@openedhand.com>

	Build fixes for the SDL flavour.

	* clutter/sdl/clutter-backend-sdl.c: Remove an unused function.

	* clutter/sdl/clutter-event-sdl.c:
	(clutter_event_dispatch): Properly cast the stage pointer.

	* clutter/sdl/clutter-stage-sdl.c:
	(clutter_stage_window_iface_init): Remove the draw_to_pixbuf()
	stub and assignment.
---
 ChangeLog                         | 13 +++++++++++++
 clutter/sdl/clutter-backend-sdl.c |  6 ------
 clutter/sdl/clutter-event-sdl.c   |  2 +-
 clutter/sdl/clutter-stage-sdl.c   | 15 ---------------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59bc69cac..b43d2f12c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-01  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	Build fixes for the SDL flavour.
+
+	* clutter/sdl/clutter-backend-sdl.c: Remove an unused function.
+
+	* clutter/sdl/clutter-event-sdl.c:
+	(clutter_event_dispatch): Properly cast the stage pointer.
+
+	* clutter/sdl/clutter-stage-sdl.c:
+	(clutter_stage_window_iface_init): Remove the draw_to_pixbuf()
+	stub and assignment.
+
 2008-05-01  Richard Purdie  <rpurdie@openedhand.com>
 
 	* configure.ac:
diff --git a/clutter/sdl/clutter-backend-sdl.c b/clutter/sdl/clutter-backend-sdl.c
index edacba060..5297a85c2 100644
--- a/clutter/sdl/clutter-backend-sdl.c
+++ b/clutter/sdl/clutter-backend-sdl.c
@@ -119,12 +119,6 @@ clutter_backend_sdl_init_events (ClutterBackend *backend)
   _clutter_events_init (backend);
 }
 
-static void
-clutter_backend_sdl_add_options (ClutterBackend *backend,
-                                 GOptionGroup   *group)
-{
-}
-
 static void
 clutter_backend_sdl_finalize (GObject *gobject)
 {
diff --git a/clutter/sdl/clutter-event-sdl.c b/clutter/sdl/clutter-event-sdl.c
index b3edfa32a..a64b31369 100644
--- a/clutter/sdl/clutter-event-sdl.c
+++ b/clutter/sdl/clutter-event-sdl.c
@@ -327,7 +327,7 @@ clutter_event_dispatch (GSource     *source,
 	{
 	  event = clutter_event_new (CLUTTER_NOTHING);
 
-          event->any.stage = clutter_stage_get_default ();
+          event->any.stage = CLUTTER_STAGE (clutter_stage_get_default ());
 
 	  if (event_translate (backend, event, &sdl_event))
 	    {
diff --git a/clutter/sdl/clutter-stage-sdl.c b/clutter/sdl/clutter-stage-sdl.c
index d0598b050..f71f1aa42 100644
--- a/clutter/sdl/clutter-stage-sdl.c
+++ b/clutter/sdl/clutter-stage-sdl.c
@@ -175,20 +175,6 @@ clutter_stage_sdl_set_cursor_visible (ClutterStageWindow *stage_window,
   SDL_ShowCursor (show_cursor);
 }
 
-static GdkPixbuf *
-clutter_stage_sdl_draw_to_pixbuf (ClutterStageWindow *stage_window,
-                                  GdkPixbuf          *dest,
-                                  gint                x,
-                                  gint                y,
-                                  gint                width,
-                                  gint                height)
-{
-  g_warning ("Stage of type `%s' do not support "
-             "ClutterStageWindow::draw_to_pixbuf",
-             G_OBJECT_TYPE_NAME (stage_window));
-  return NULL;
-}
-
 static void
 clutter_stage_sdl_set_title (ClutterStageWindow *stage_window,
 			     const gchar        *title)
@@ -228,7 +214,6 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
   iface->set_fullscreen = clutter_stage_sdl_set_fullscreen;
   iface->set_cursor_visible = clutter_stage_sdl_set_cursor_visible;
   iface->set_title = clutter_stage_sdl_set_title;
-  iface->draw_to_pixbuf = clutter_stage_sdl_draw_to_pixbuf;
 }
 
 static void