Index: widgets/text/e-text-model-uri.c
===================================================================
--- widgets/text/e-text-model-uri.c	(revision 33820)
+++ widgets/text/e-text-model-uri.c	(working copy)
@@ -54,12 +54,7 @@
 #define PARENT_TYPE E_TYPE_TEXT_MODEL
 static GtkObject *parent_class;
 
-E_MAKE_TYPE (e_text_model_uri,
-	     "ETextModelURI",
-	     ETextModelURI,
-	     e_text_model_uri_class_init,
-	     e_text_model_uri_init,
-	     PARENT_TYPE)
+G_DEFINE_TYPE (ETextModelURI, e_text_model_uri, PARENT_TYPE)
 	     
 static void
 e_text_model_uri_class_init (ETextModelURIClass *klass)
Index: widgets/text/e-completion-view.c
===================================================================
--- widgets/text/e-completion-view.c	(revision 33820)
+++ widgets/text/e-completion-view.c	(working copy)
@@ -199,13 +199,8 @@
 	}
 }
 
-E_MAKE_TYPE (e_completion_view,
-	     "ECompletionView",
-	     ECompletionView,
-	     e_completion_view_class_init,
-	     e_completion_view_init,
-	     PARENT_TYPE)
-	     
+G_DEFINE_TYPE (ECompletionView, e_completion_view, PARENT_TYPE)
+
 static void
 e_completion_view_class_init (ECompletionViewClass *klass)
 {
Index: widgets/text/e-text-model.c
===================================================================
--- widgets/text/e-text-model.c	(revision 33820)
+++ widgets/text/e-text-model.c	(working copy)
@@ -75,12 +75,7 @@
  * 
  * Return value: The type ID of the &ETextModel class.
  **/
-E_MAKE_TYPE (e_text_model,
-	     "ETextModel",
-	     ETextModel,
-	     e_text_model_class_init,
-	     e_text_model_init,
-	     PARENT_TYPE)
+G_DEFINE_TYPE (ETextModel, e_text_model, PARENT_TYPE)
 
 /* Class initialization function for the text item */
 static void
Index: widgets/text/e-text.c
===================================================================
--- widgets/text/e-text.c	(revision 33820)
+++ widgets/text/e-text.c	(working copy)
@@ -3812,12 +3812,7 @@
  * 
  * Return value: The type ID of the &EText class.
  **/
-E_MAKE_TYPE (e_text,
-	     "EText",
-	     EText,
-	     e_text_class_init,
-	     e_text_init,
-	     PARENT_TYPE)
+G_DEFINE_TYPE (EText, e_text, PARENT_TYPE)
 
 
 
Index: widgets/text/e-completion-callbacks.c
===================================================================
--- widgets/text/e-completion-callbacks.c	(revision 33820)
+++ widgets/text/e-completion-callbacks.c	(working copy)
@@ -41,15 +41,8 @@
 #define PARENT_TYPE E_COMPLETION_TYPE
 static ECompletionClass *parent_class;
 
-
+G_DEFINE_TYPE (ECompletionCallbacks, e_completion_callbacks, PARENT_TYPE)
 
-E_MAKE_TYPE (e_completion_callbacks,
-	     "ECompletionCallbacks",
-	     ECompletionCallbacks,
-	     e_completion_callbacks_class_init,
-	     e_completion_callbacks_init,
-	     PARENT_TYPE)
-
 static void
 e_completion_callbacks_class_init (ECompletionCallbacksClass *klass)
 {
Index: widgets/text/e-entry.c
===================================================================
--- widgets/text/e-entry.c	(revision 33820)
+++ widgets/text/e-entry.c	(working copy)
@@ -296,10 +296,9 @@
 }
 
 static void
-e_entry_init (GtkObject *object)
+e_entry_init (EEntry *entry)
 {
-	EEntry *entry = E_ENTRY (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
+	GtkTable *gtk_table = GTK_TABLE (entry);
 
 	entry->priv = g_new0 (EEntryPrivate, 1);
 
@@ -1150,10 +1149,10 @@
 }
 
 static void
-e_entry_class_init (GObjectClass *object_class)
+e_entry_class_init (EEntryClass *klass)
 {
-	EEntryClass *klass = E_ENTRY_CLASS(object_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(object_class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
@@ -1343,4 +1342,5 @@
 							       G_PARAM_READWRITE));
 }
 
-E_MAKE_TYPE(e_entry, "EEntry", EEntry, e_entry_class_init, e_entry_init, PARENT_TYPE)
+G_DEFINE_TYPE (EEntry, e_entry, PARENT_TYPE)
+
Index: widgets/text/e-table-text-model.c
===================================================================
--- widgets/text/e-table-text-model.c	(revision 33820)
+++ widgets/text/e-table-text-model.c	(working copy)
@@ -55,13 +55,8 @@
  * 
  * Return value: The type ID of the &ETableTextModel class.
  **/
-E_MAKE_TYPE (e_table_text_model,
-	     "ETableTextModel",
-	     ETableTextModel,
-	     e_table_text_model_class_init,
-	     e_table_text_model_init,
-	     PARENT_TYPE)
-	     
+G_DEFINE_TYPE (ETableTextModel, e_table_text_model, PARENT_TYPE)
+
 /* Class initialization function for the text item */
 static void
 e_table_text_model_class_init (ETableTextModelClass *klass)
Index: widgets/text/e-completion.c
===================================================================
--- widgets/text/e-completion.c	(revision 33820)
+++ widgets/text/e-completion.c	(working copy)
@@ -67,15 +67,8 @@
 #define PARENT_TYPE GTK_TYPE_OBJECT
 static GtkObjectClass *parent_class;
 
-
+G_DEFINE_TYPE (ECompletion, e_completion, PARENT_TYPE)
 
-E_MAKE_TYPE (e_completion,
-	     "ECompletion",
-	     ECompletion,
-	     e_completion_class_init,
-	     e_completion_init,
-	     PARENT_TYPE)
-
 static void
 e_completion_class_init (ECompletionClass *klass)
 {
