From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Wed, 29 Nov 2006 22:51:01 +0000 (+0000)
Subject: 2006-11-29  Emmanuele Bassi  <ebassi@openedhand.com>
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=29e58f6eb0d0ed27a7b0bc7ab59aeb4c79283200;p=clutter-gtk

2006-11-29  Emmanuele Bassi  <ebassi@openedhand.com>

	* clutter-gtk/gtk-clutter.c:
	(gtk_clutter_destroy): Destroy the ClutterStage instead
	of unreffing it.

	(gtk_clutter_size_allocate): Queue a redraw if the stage
	is marked as visible.

	(gtk_clutter_realize): Remove the forced realize: the
	stage is already realized by default.

	* examples/gtk-clutter-test.c: Use gtk_main_quit().
---

diff --git a/ChangeLog b/ChangeLog
index 79538e1..825385f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2006-11-29  Emmanuele Bassi  <ebassi@openedhand.com>
 
+	* clutter-gtk/gtk-clutter.c:
+	(gtk_clutter_destroy): Destroy the ClutterStage instead
+	of unreffing it.
+
+	(gtk_clutter_size_allocate): Queue a redraw if the stage
+	is marked as visible.
+
+	(gtk_clutter_realize): Remove the forced realize: the
+	stage is already realized by default.
+
+	* examples/gtk-clutter-test.c: Use gtk_main_quit().
+
+2006-11-29  Emmanuele Bassi  <ebassi@openedhand.com>
+
 	* clutter-gtk/gtk-clutter.h: Add constructor; clean up.
 
 	* clutter-gtk/gtk-clutter.c:
diff --git a/clutter-gtk/gtk-clutter.c b/clutter-gtk/gtk-clutter.c
index 7e9d9fb..a94327f 100644
--- a/clutter-gtk/gtk-clutter.c
+++ b/clutter-gtk/gtk-clutter.c
@@ -65,7 +65,7 @@ gtk_clutter_destroy (GtkObject *object)
 
   if (priv->stage)
     {
-      g_object_unref (G_OBJECT (priv->stage));
+      clutter_actor_destroy (priv->stage);
       priv->stage = NULL;
     }
 
@@ -82,7 +82,8 @@ gtk_clutter_size_allocate (GtkWidget     *widget,
                           allocation->width,
                           allocation->height);
 
-  clutter_actor_queue_redraw (priv->stage);
+  if (CLUTTER_ACTOR_IS_VISIBLE (priv->stage))
+    clutter_actor_queue_redraw (priv->stage);
 }
 
 static void
@@ -125,9 +126,6 @@ gtk_clutter_realize (GtkWidget *widget)
 
   clutter_stage_set_xwindow_foreign (CLUTTER_STAGE (priv->stage), 
                                      GDK_WINDOW_XID (widget->window));
-  
-  /* force a realize */
-  clutter_actor_realize (priv->stage);
 }
 
 static void
diff --git a/examples/gtk-clutter-test.c b/examples/gtk-clutter-test.c
index 646b232..1d14684 100644
--- a/examples/gtk-clutter-test.c
+++ b/examples/gtk-clutter-test.c
@@ -49,7 +49,7 @@ input_cb (ClutterStage *stage,
 	       clutter_key_event_symbol (kev));
       
       if (clutter_key_event_symbol (kev) == CLUTTER_q)
-	clutter_main_quit ();
+	gtk_main_quit ();
     }
 }