1 files changed, 12 insertions, 32 deletions

diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index 64e79d8f9d..1af357e7c3 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -115,7 +115,7 @@ static const int time_map[] = {
 
 static void alarm_page_class_init (AlarmPageClass *class);
 static void alarm_page_init (AlarmPage *apage);
-static void alarm_page_destroy (GtkObject *object);
+static void alarm_page_finalize (GObject *object);
 
 static GtkWidget *alarm_page_get_widget (CompEditorPage *page);
 static void alarm_page_focus_main_widget (CompEditorPage *page);
@@ -136,41 +136,21 @@ static CompEditorPageClass *parent_class = NULL;
  *
  * Return value: The type ID of the #AlarmPage class.
  **/
-GtkType
-alarm_page_get_type (void)
-{
-	static GtkType alarm_page_type;
-
-	if (!alarm_page_type) {
-		static const GtkTypeInfo alarm_page_info = {
-			"AlarmPage",
-			sizeof (AlarmPage),
-			sizeof (AlarmPageClass),
-			(GtkClassInitFunc) alarm_page_class_init,
-			(GtkObjectInitFunc) alarm_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		alarm_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-						   &alarm_page_info);
-	}
 
-	return alarm_page_type;
-}
+E_MAKE_TYPE (alarm_page, "AlarmPage", AlarmPage, alarm_page_class_init,
+	     alarm_page_init, TYPE_COMP_EDITOR_PAGE);
 
 /* Class initialization function for the alarm page */
 static void
 alarm_page_class_init (AlarmPageClass *class)
 {
 	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
+	GObjectClass *gobject_class;
 
 	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
+	gobject_class = (GObjectClass *) class;
 
-	parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE);
+	parent_class = g_type_class_ref (TYPE_COMP_EDITOR_PAGE);
 
 	editor_page_class->get_widget = alarm_page_get_widget;
 	editor_page_class->focus_main_widget = alarm_page_focus_main_widget;
@@ -179,7 +159,7 @@ alarm_page_class_init (AlarmPageClass *class)
 	editor_page_class->set_summary = alarm_page_set_summary;
 	editor_page_class->set_dates = alarm_page_set_dates;
 
-	object_class->destroy = alarm_page_destroy;
+	gobject_class->finalize = alarm_page_finalize;
 }
 
 /* Object initialization function for the alarm page */
@@ -223,7 +203,7 @@ alarm_page_init (AlarmPage *apage)
 
 /* Destroy handler for the alarm page */
 static void
-alarm_page_destroy (GtkObject *object)
+alarm_page_finalize (GObject *object)
 {
 	AlarmPage *apage;
 	AlarmPagePrivate *priv;
@@ -247,8 +227,8 @@ alarm_page_destroy (GtkObject *object)
 	g_free (priv);
 	apage->priv = NULL;
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	if (G_OBJECT_CLASS (parent_class)->finalize)
+		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 
@@ -891,9 +871,9 @@ alarm_page_new (void)
 {
 	AlarmPage *apage;
 
-	apage = gtk_type_new (TYPE_ALARM_PAGE);
+	apage = g_object_new (TYPE_ALARM_PAGE, NULL);
 	if (!alarm_page_construct (apage)) {
-		g_object_unref((apage));
+		g_object_unref ((apage));
 		return NULL;
 	}