From 0033b539b8b10c7e98bfbcc255c6efa2b5c0b9c9 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Wed, 27 Dec 2006 18:25:43 +0000
Subject: [PATCH] 2006-12-27  Emmanuele Bassi  <ebassi@openedhand.com>

	* clutter/clutter-stage.[ch]:
	* clutter/clutter-event.[ch]: Revert changes; this is what
	happens when you keep old tree around.
---
 ChangeLog                             |  6 ++++++
 clutter/clutter-event.h               |  4 +---
 clutter/clutter-stage.c               | 12 +-----------
 clutter/clutter-stage.h               |  2 --
 configure.ac                          |  4 ++--
 doc/reference/tmpl/clutter-event.sgml |  1 -
 doc/reference/tmpl/clutter-stage.sgml |  9 ---------
 7 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f4da6873..e5fab5861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-27  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-stage.[ch]:
+	* clutter/clutter-event.[ch]: Revert changes; this is what
+	happens when you keep old tree around.
+
 2006-12-27  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-color.h:
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 3a2aefaab..59f29e56f 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -50,8 +50,7 @@ typedef enum
   CLUTTER_MOTION,
   CLUTTER_BUTTON_PRESS,
   CLUTTER_2BUTTON_PRESS, 	/* Double click */
-  CLUTTER_BUTTON_RELEASE,
-  CLUTTER_DELETE_EVENT
+  CLUTTER_BUTTON_RELEASE
 } ClutterEventType;
 
 #define CLUTTER_TYPE_EVENT	(clutter_event_get_type ())
@@ -65,7 +64,6 @@ typedef struct _ClutterMotionEvent ClutterMotionEvent;
 
 typedef struct _ClutterInputDevice ClutterInputDevice;
 
-
 struct _ClutterAnyEvent
 {
   ClutterEventType  type;
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 28bb2b3c5..28020a55c 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -92,7 +92,6 @@ enum
   KEY_PRESS_EVENT,
   KEY_RELEASE_EVENT,
   MOTION_EVENT,
-  DELETE_EVENT,
   
   LAST_SIGNAL
 };
@@ -833,16 +832,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
 		  clutter_marshal_VOID__BOXED,
 		  G_TYPE_NONE, 1,
 		  CLUTTER_TYPE_EVENT);
-  stage_signals[DELETE_EVENT] =
-    g_signal_new ("delete-event",
-                  G_TYPE_FROM_CLASS (gobject_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (ClutterStageClass, delete_event),
-                  NULL, NULL,
-                  clutter_marshal_VOID__BOXED,
-                  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_EVENT);
-
+  
   g_type_class_add_private (gobject_class, sizeof (ClutterStagePrivate));
 }
 
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 7e6f52cfe..94937f93e 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -97,8 +97,6 @@ struct _ClutterStageClass
 		  		ClutterKeyEvent    *event);
   void (*motion_event)         (ClutterStage       *stage,
 		  		ClutterMotionEvent *event);
-  void (*delete_event)         (ClutterStage       *stage,
-                                ClutterEvent       *event);
 
   /* padding for future expansion */
   void (*_clutter_stage1) (void);
diff --git a/configure.ac b/configure.ac
index f896496a4..87d916e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # An odd micro number indicates in-progress development, (eg. from CVS)
 # An even micro number indicates a released version.
 m4_define([clutter_major_version], [0])
-m4_define([clutter_minor_version], [2])
-m4_define([clutter_micro_version], [0])
+m4_define([clutter_minor_version], [1])
+m4_define([clutter_micro_version], [1])
 
 m4_define([clutter_version],
           [clutter_major_version.clutter_minor_version.clutter_micro_version])
diff --git a/doc/reference/tmpl/clutter-event.sgml b/doc/reference/tmpl/clutter-event.sgml
index 2b288ccce..0447456af 100644
--- a/doc/reference/tmpl/clutter-event.sgml
+++ b/doc/reference/tmpl/clutter-event.sgml
@@ -29,7 +29,6 @@ Windowing events handled by Clutter.
 @CLUTTER_BUTTON_PRESS: 
 @CLUTTER_2BUTTON_PRESS: 
 @CLUTTER_BUTTON_RELEASE: 
-@CLUTTER_DELETE_EVENT: 
 
 <!-- ##### STRUCT ClutterAnyEvent ##### -->
 <para>
diff --git a/doc/reference/tmpl/clutter-stage.sgml b/doc/reference/tmpl/clutter-stage.sgml
index 942100aef..979a5e68e 100644
--- a/doc/reference/tmpl/clutter-stage.sgml
+++ b/doc/reference/tmpl/clutter-stage.sgml
@@ -53,14 +53,6 @@ Macro evaluating to the height of the #ClutterStage
 @clutterstage: the object which received the signal.
 @arg1: 
 
-<!-- ##### SIGNAL ClutterStage::delete-event ##### -->
-<para>
-
-</para>
-
-@clutterstage: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL ClutterStage::input-event ##### -->
 <para>
 
@@ -125,7 +117,6 @@ Macro evaluating to the height of the #ClutterStage
 @key_press_event: 
 @key_release_event: 
 @motion_event: 
-@delete_event: 
 @_clutter_stage1: 
 @_clutter_stage2: 
 @_clutter_stage3: