add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migration

2001-10-05  Michael Meeks  <michael@ximian.com>

	* gal/util/e-util.h: add E_OBJECT_CLASS_ADD_SIGNALS and
	E_OBJECT_CLASS_TYPE to ease migration to Gnome 2.0 from
	a single source base.

	* All C files:
	s/object_class->type,/E_OBJECT_CLASS_TYPE (object_class),/g;
	s/gtk_object_class_add_signals([^\(]*)\(([^,]*),([^,]*),([^\)]*)/
	E_OBJECT_CLASS_ADD_SIGNALS\1(\2,\3,\4/;

svn path=/trunk/; revision=13428

31 files changed, 166 insertions, 142 deletions

diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 6449b23463..466eb07888 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -20,6 +20,7 @@
  */
 
 #include "e-text-event-processor.h"
+#include <gal/util/e-util.h>
 #include <gtk/gtksignal.h>
 
 static void e_text_event_processor_init		(ETextEventProcessor		 *card);
@@ -80,13 +81,13 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass)
 	e_tep_signals[E_TEP_EVENT] =
 		gtk_signal_new ("command",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1,
 				GTK_TYPE_POINTER);
 
-	gtk_object_class_add_signals (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);
 
 	gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL,
 				 GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 22b96a376a..179a2c2788 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -52,6 +52,16 @@ GtkType l##_get_type(void)\
 	return type;\
 }
 
+#if 1
+#  define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last) \
+	gtk_object_class_add_signals (oc, sigs, last)
+#  define E_OBJECT_CLASS_TYPE(oc) (oc)->type
+#else
+#  define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last)
+#  define E_OBJECT_CLASS_TYPE(oc) G_TYPE_FROM_CLASS (oc)
+#endif
+
+
 typedef enum {
 	E_FOCUS_NONE,
 	E_FOCUS_CURRENT,
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 2503a4cc79..447b9a0728 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -109,7 +109,7 @@ gal_view_collection_class_init (GtkObjectClass *object_class)
 	gal_view_collection_signals [DISPLAY_VIEW] =
 		gtk_signal_new ("display_view",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (GalViewCollectionClass, display_view),
 				gtk_marshal_NONE__OBJECT,
 				GTK_TYPE_NONE, 1, GAL_VIEW_TYPE);
@@ -117,12 +117,12 @@ gal_view_collection_class_init (GtkObjectClass *object_class)
 	gal_view_collection_signals [CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (GalViewCollectionClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 
-	gtk_object_class_add_signals (object_class, gal_view_collection_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, gal_view_collection_signals, LAST_SIGNAL);
 
 	klass->display_view = NULL;
 	klass->changed      = NULL;
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index f48a6f0026..3f89cbb517 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "gal-view.h"
+#include "gal/util/e-util.h"
 
 #define GV_CLASS(e) ((GalViewClass *)((GtkObject *)e)->klass)
 
@@ -176,12 +177,12 @@ gal_view_class_init      (GtkObjectClass *object_class)
 	gal_view_signals [CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (GalViewClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 
-	gtk_object_class_add_signals (object_class, gal_view_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, gal_view_signals, LAST_SIGNAL);
 }
 
 GtkType
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index f06aa6e33b..0e374d391c 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -22,6 +22,7 @@
 
 #include <gtk/gtksignal.h>
 #include "e-canvas.h"
+#include "gal/util/e-util.h"
 
 static void e_canvas_init           (ECanvas         *card);
 static void e_canvas_destroy        (GtkObject        *object);
@@ -107,12 +108,12 @@ e_canvas_class_init (ECanvasClass *klass)
 	e_canvas_signals [REFLOW] =
 		gtk_signal_new ("reflow",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECanvasClass, reflow),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 
-	gtk_object_class_add_signals (object_class, e_canvas_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_canvas_signals, LAST_SIGNAL);
 }
 
 static void
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index f029e88573..b3d4cca6a6 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -39,7 +39,7 @@ e_printable_class_init (GtkObjectClass *object_class)
 	e_printable_signals [PRINT_PAGE] =
 		gtk_signal_new ("print_page",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EPrintableClass, print_page),
 				e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL,
 				GTK_TYPE_NONE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
@@ -47,7 +47,7 @@ e_printable_class_init (GtkObjectClass *object_class)
 	e_printable_signals [DATA_LEFT] =
 		gtk_signal_new ("data_left",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EPrintableClass, data_left),
 				gtk_marshal_BOOL__NONE,
 				GTK_TYPE_BOOL, 0, GTK_TYPE_NONE);
@@ -55,7 +55,7 @@ e_printable_class_init (GtkObjectClass *object_class)
 	e_printable_signals [RESET] =
 		gtk_signal_new ("reset",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EPrintableClass, reset),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0, GTK_TYPE_NONE);
@@ -63,7 +63,7 @@ e_printable_class_init (GtkObjectClass *object_class)
 	e_printable_signals [HEIGHT] =
 		gtk_signal_new ("height",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EPrintableClass, height),
 				e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL,
 				GTK_TYPE_DOUBLE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
@@ -71,12 +71,12 @@ e_printable_class_init (GtkObjectClass *object_class)
 	e_printable_signals [WILL_FIT] =
 		gtk_signal_new ("will_fit",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EPrintableClass, will_fit),
 				e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL,
 				GTK_TYPE_BOOL, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
 
-	gtk_object_class_add_signals (object_class, e_printable_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_printable_signals, LAST_SIGNAL);
 
 	klass->print_page = NULL;    
 	klass->data_left = NULL;
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 74e7b1726c..4967d21ea3 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include "e-reflow-model.h"
 #include <gtk/gtksignal.h>
+#include "gal/util/e-util.h"
 
 #define ERM_CLASS(e) ((EReflowModelClass *)((GtkObject *)e)->klass)
 
@@ -143,7 +144,7 @@ e_reflow_model_class_init (GtkObjectClass *object_class)
 	e_reflow_model_signals [MODEL_CHANGED] =
 		gtk_signal_new ("model_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EReflowModelClass, model_changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -151,7 +152,7 @@ e_reflow_model_class_init (GtkObjectClass *object_class)
 	e_reflow_model_signals [MODEL_ITEMS_INSERTED] =
 		gtk_signal_new ("model_items_inserted",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EReflowModelClass, model_items_inserted),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
@@ -159,12 +160,12 @@ e_reflow_model_class_init (GtkObjectClass *object_class)
 	e_reflow_model_signals [MODEL_ITEM_CHANGED] =
 		gtk_signal_new ("model_item_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EReflowModelClass, model_item_changed),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, e_reflow_model_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_reflow_model_signals, LAST_SIGNAL);
 
 	klass->set_width            = NULL;
 	klass->count                = NULL;
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 3674b6d11f..9402821c4f 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -1180,12 +1180,12 @@ e_reflow_class_init (EReflowClass *klass)
 	signals [SELECTION_EVENT] =
 		gtk_signal_new ("selection_event",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EReflowClass, selection_event),
 				e_marshal_INT__OBJECT_POINTER,
 				GTK_TYPE_INT, 2, GTK_TYPE_OBJECT, GTK_TYPE_GDK_EVENT);
 
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, signals, LAST_SIGNAL);
 
 	object_class->set_arg  = e_reflow_set_arg;
 	object_class->get_arg  = e_reflow_get_arg;
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index e8b19fc618..26f6769ae3 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -136,7 +136,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 	e_selection_model_signals [CURSOR_CHANGED] =
 		gtk_signal_new ("cursor_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_changed),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
@@ -144,7 +144,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 	e_selection_model_signals [CURSOR_ACTIVATED] =
 		gtk_signal_new ("cursor_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_activated),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
@@ -152,7 +152,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 	e_selection_model_signals [SELECTION_CHANGED] =
 		gtk_signal_new ("selection_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ESelectionModelClass, selection_changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -180,7 +180,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 	klass->set_selection_end  = NULL;
 
 
-	gtk_object_class_add_signals (object_class, e_selection_model_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_selection_model_signals, LAST_SIGNAL);
 
 	gtk_object_add_arg_type ("ESelectionModel::sorter", GTK_TYPE_OBJECT,
 				 GTK_ARG_READWRITE, ARG_SORTER);
diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c
index 80fb519e48..60485cb891 100644
--- a/widgets/table/e-cell-spin-button.c
+++ b/widgets/table/e-cell-spin-button.c
@@ -149,14 +149,14 @@ e_cell_spin_button_class_init     (GtkObjectClass   *klass)
 	signals[STEP] =
 		gtk_signal_new ("step",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ECellSpinButtonClass, step),
 				e_marshal_NONE__POINTER_INT_INT_INT,
 				GTK_TYPE_NONE,
 				4, GTK_TYPE_POINTER, GTK_TYPE_INT, 
 				GTK_TYPE_INT, GTK_TYPE_INT);
 	
-	gtk_object_class_add_signals (klass, signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (klass, signals, LAST_SIGNAL);
 }
 
 static void 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 3759b32e3e..aef0d06564 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -22,6 +22,7 @@
 #include "gal/e-text/e-text.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-canvas-utils.h"
+#include "gal/util/e-util.h"
 
 enum {
 	CURSOR_CHANGE,
@@ -465,12 +466,12 @@ etcta_class_init (ETableClickToAddClass *klass)
 	etcta_signals [CURSOR_CHANGE] =
 		gtk_signal_new ("cursor_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClickToAddClass, cursor_change),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, etcta_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, etcta_signals, LAST_SIGNAL);
 }
 
 static void
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
index a3d6201ffd..ae1b45f5b2 100644
--- a/widgets/table/e-table-column.c
+++ b/widgets/table/e-table-column.c
@@ -53,19 +53,19 @@ e_table_column_class_init (GtkObjectClass *object_class)
 	etc_signals [STRUCTURE_CHANGE] =
 		gtk_signal_new ("structure_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableColumn, structure_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 	etc_signals [DIMENSION_CHANGE] = 
 		gtk_signal_new ("dimension_change", 
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableColumn, dimension_change),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, etc_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, etc_signals, LAST_SIGNAL);
 }
 
 GtkType
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 1c379a2a5b..c0e4c7f0c3 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -104,12 +104,12 @@ config_class_init (GtkObjectClass *object_class)
 	e_table_config_signals [CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableConfigClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 
-	gtk_object_class_add_signals (object_class, e_table_config_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_table_config_signals, LAST_SIGNAL);
 
 	gtk_object_add_arg_type ("ETableConfig::state", E_TABLE_STATE_TYPE,
 				 GTK_ARG_READABLE, ARG_STATE);
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 3084d9e758..9eb649168e 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -17,6 +17,7 @@
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
 #include "gal/widgets/e-canvas.h"
 
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 32c972ed40..0b53076132 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -631,7 +631,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [CURSOR_CHANGE] =
 		gtk_signal_new ("cursor_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_change),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -639,7 +639,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [CURSOR_ACTIVATED] =
 		gtk_signal_new ("cursor_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_activated),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -647,7 +647,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [DOUBLE_CLICK] =
 		gtk_signal_new ("double_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, double_click),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -655,7 +655,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [RIGHT_CLICK] =
 		gtk_signal_new ("right_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, right_click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -663,7 +663,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [CLICK] =
 		gtk_signal_new ("click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -671,7 +671,7 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, key_press),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -679,12 +679,12 @@ etg_class_init (GtkObjectClass *object_class)
 	etg_signals [START_DRAG] =
 		gtk_signal_new ("start_drag",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableGroupClass, start_drag),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
 
-	gtk_object_class_add_signals (object_class, etg_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, etg_signals, LAST_SIGNAL);
 }
 
 E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index f2bf4a2928..90b2f1de9b 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -21,6 +21,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gal/widgets/e-cursors.h"
 #include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
 #include "gal/widgets/e-canvas.h"
 #include "gal/widgets/e-popup-menu.h"
@@ -1578,12 +1579,12 @@ ethi_class_init (GtkObjectClass *object_class)
 	ethi_signals [BUTTON_PRESSED] =
 		gtk_signal_new ("button_pressed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableHeaderItemClass, button_pressed),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1, GTK_TYPE_GDK_EVENT);
 		
-	gtk_object_class_add_signals (object_class, ethi_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, ethi_signals, LAST_SIGNAL);
 }
 
 static void
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index dd5625df99..e29730ac32 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -13,6 +13,7 @@
 #include <gtk/gtksignal.h>
 #include "e-table-header.h"
 #include "e-table-defines.h"
+#include "gal/util/e-util.h"
 
 /* The arguments we take */
 enum {
@@ -236,26 +237,26 @@ e_table_header_class_init (GtkObjectClass *object_class)
 	eth_signals [STRUCTURE_CHANGE] =
 		gtk_signal_new ("structure_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableHeaderClass, structure_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 	eth_signals [DIMENSION_CHANGE] = 
 		gtk_signal_new ("dimension_change", 
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableHeaderClass, dimension_change),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 	eth_signals [REQUEST_WIDTH] = 
 		gtk_signal_new ("request_width",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableHeaderClass, request_width),
 				gtk_marshal_INT__INT,
 				GTK_TYPE_INT, 1, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, eth_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, eth_signals, LAST_SIGNAL);
 }
 
 static void
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 794c64dc84..c4b23b83ca 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2433,7 +2433,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [CURSOR_CHANGE] =
 		gtk_signal_new ("cursor_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_change),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -2441,7 +2441,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [CURSOR_ACTIVATED] =
 		gtk_signal_new ("cursor_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_activated),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -2449,7 +2449,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [DOUBLE_CLICK] =
 		gtk_signal_new ("double_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, double_click),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2457,7 +2457,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [START_DRAG] =
 		gtk_signal_new ("start_drag",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, start_drag),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2465,7 +2465,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [RIGHT_CLICK] =
 		gtk_signal_new ("right_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, right_click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2473,7 +2473,7 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [CLICK] =
 		gtk_signal_new ("click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2481,12 +2481,12 @@ eti_class_init (GtkObjectClass *object_class)
 	eti_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableItemClass, key_press),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
 
-	gtk_object_class_add_signals (object_class, eti_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, eti_signals, LAST_SIGNAL);
 
 }
 
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 9a0b3561dd..ff9258e169 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "e-table-model.h"
+#include "gal/util/e-util.h"
 
 #define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass)
 
@@ -261,7 +262,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_CHANGED] =
 		gtk_signal_new ("model_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -269,7 +270,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_PRE_CHANGE] =
 		gtk_signal_new ("model_pre_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_pre_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -277,7 +278,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_ROW_CHANGED] =
 		gtk_signal_new ("model_row_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_row_changed),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -285,7 +286,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_CELL_CHANGED] =
 		gtk_signal_new ("model_cell_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_cell_changed),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
@@ -293,7 +294,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_ROWS_INSERTED] =
 		gtk_signal_new ("model_rows_inserted",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_rows_inserted),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
@@ -301,12 +302,12 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	e_table_model_signals [MODEL_ROWS_DELETED] =
 		gtk_signal_new ("model_rows_deleted",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableModelClass, model_rows_deleted),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, e_table_model_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_table_model_signals, LAST_SIGNAL);
 
 	klass->column_count        = NULL;     
 	klass->row_count           = NULL;        
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 716667a197..72ee3bacce 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -8,6 +8,7 @@
  * (C) 2000, 2001 Ximian, Inc.
  */
 #include <config.h>
+#include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtksignal.h>
 #include "e-table-selection-model.h"
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index ed10e6c73b..ffe6eaf5ce 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -76,7 +76,7 @@ e_table_sort_info_class_init (ETableSortInfoClass *klass)
 	e_table_sort_info_signals [SORT_INFO_CHANGED] =
 		gtk_signal_new ("sort_info_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableSortInfoClass, sort_info_changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -84,7 +84,7 @@ e_table_sort_info_class_init (ETableSortInfoClass *klass)
 	e_table_sort_info_signals [GROUP_INFO_CHANGED] =
 		gtk_signal_new ("group_info_changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableSortInfoClass, group_info_changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -92,7 +92,7 @@ e_table_sort_info_class_init (ETableSortInfoClass *klass)
 	klass->sort_info_changed = NULL;
 	klass->group_info_changed = NULL;
 
-	gtk_object_class_add_signals (object_class, e_table_sort_info_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_table_sort_info_signals, LAST_SIGNAL);
 }
 
 E_MAKE_TYPE(e_table_sort_info, "ETableSortInfo", ETableSortInfo,
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 05b4d5a004..ee4078009e 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include "gal/util/e-i18n.h"
+#include "gal/util/e-util.h"
 #include "e-table-utils.h"
 #include "e-table-header-utils.h"
 
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 9cf7b26877..19393a4d85 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -2245,7 +2245,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [CURSOR_CHANGE] =
 		gtk_signal_new ("cursor_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, cursor_change),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -2253,7 +2253,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [CURSOR_ACTIVATED] =
 		gtk_signal_new ("cursor_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, cursor_activated),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
@@ -2261,7 +2261,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [SELECTION_CHANGE] =
 		gtk_signal_new ("selection_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, selection_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -2269,7 +2269,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [DOUBLE_CLICK] =
 		gtk_signal_new ("double_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, double_click),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2277,7 +2277,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [RIGHT_CLICK] =
 		gtk_signal_new ("right_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, right_click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2285,7 +2285,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [CLICK] =
 		gtk_signal_new ("click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, click),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2293,7 +2293,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, key_press),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2301,7 +2301,7 @@ e_table_class_init (ETableClass *class)
 	et_signals [START_DRAG] =
 		gtk_signal_new ("start_drag",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, start_drag),
 				e_marshal_INT__INT_INT_POINTER,
 				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2309,7 +2309,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_BEGIN] =
 		gtk_signal_new ("table_drag_begin",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_begin),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3,
@@ -2319,7 +2319,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_END] =
 		gtk_signal_new ("table_drag_end",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_end),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3,
@@ -2329,7 +2329,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_DATA_GET] =
 		gtk_signal_new ("table_drag_data_get",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_get),
 				e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT,
 				GTK_TYPE_NONE, 6,
@@ -2342,7 +2342,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_DATA_DELETE] =
 		gtk_signal_new ("table_drag_data_delete",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_delete),
 				gtk_marshal_NONE__INT_INT_POINTER,
 				GTK_TYPE_NONE, 3,
@@ -2353,7 +2353,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_LEAVE] =
 		gtk_signal_new ("table_drag_leave",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_leave),
 				e_marshal_NONE__INT_INT_POINTER_UINT,
 				GTK_TYPE_NONE, 4,
@@ -2364,7 +2364,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_MOTION] =
 		gtk_signal_new ("table_drag_motion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_motion),
 				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 6,
@@ -2377,7 +2377,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_DROP] =
 		gtk_signal_new ("table_drag_drop",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_drop),
 				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 6,
@@ -2390,7 +2390,7 @@ e_table_class_init (ETableClass *class)
 	et_signals[TABLE_DRAG_DATA_RECEIVED] =
 		gtk_signal_new ("table_drag_data_received",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_received),
 				e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT,
 				GTK_TYPE_NONE, 8,
@@ -2403,14 +2403,14 @@ e_table_class_init (ETableClass *class)
 				GTK_TYPE_UINT,
 				GTK_TYPE_UINT);
 
-	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, et_signals, LAST_SIGNAL);
 
 	class->set_scroll_adjustments = set_scroll_adjustments;
 
 	widget_class->set_scroll_adjustments_signal =
 		gtk_signal_new ("set_scroll_adjustments",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETableClass, set_scroll_adjustments),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index f304d1e0cf..fb011f14f1 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -55,7 +55,7 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [PRE_CHANGE] =
 		gtk_signal_new ("pre_change",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, pre_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -63,7 +63,7 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [NODE_CHANGED] =
 		gtk_signal_new ("node_changed",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, node_changed),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
@@ -71,7 +71,7 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [NODE_DATA_CHANGED] =
 		gtk_signal_new ("node_data_changed",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, node_data_changed),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
@@ -79,7 +79,7 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [NODE_COL_CHANGED] =
 		gtk_signal_new ("node_col_changed",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, node_col_changed),
 				gtk_marshal_NONE__POINTER_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
@@ -87,7 +87,7 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [NODE_INSERTED] =
 		gtk_signal_new ("node_inserted",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, node_inserted),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
@@ -95,12 +95,12 @@ e_tree_model_class_init (GtkObjectClass *klass)
 	e_tree_model_signals [NODE_REMOVED] =
 		gtk_signal_new ("node_removed",
 				GTK_RUN_LAST,
-				klass->type,
+				E_OBJECT_CLASS_TYPE (klass),
 				GTK_SIGNAL_OFFSET (ETreeModelClass, node_removed),
 				e_marshal_NONE__POINTER_POINTER_INT,
 				GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, GTK_TYPE_POINTER, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (klass, e_tree_model_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (klass, e_tree_model_signals, LAST_SIGNAL);
 
 	tree_class->get_root             = NULL;
 
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index e1c960d078..7045d63a7d 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -1183,12 +1183,12 @@ e_tree_sorted_class_init (ETreeSortedClass *klass)
 	signals [NODE_RESORTED] =
 		gtk_signal_new ("node_resorted",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeSortedClass, node_resorted),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, signals, LAST_SIGNAL);
 }
 
 static void
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index a89eb82f0c..abb5bdcec8 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -2396,7 +2396,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [CURSOR_CHANGE] =
 		gtk_signal_new ("cursor_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, cursor_change),
 				gtk_marshal_NONE__INT_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_POINTER);
@@ -2404,7 +2404,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [CURSOR_ACTIVATED] =
 		gtk_signal_new ("cursor_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, cursor_activated),
 				gtk_marshal_NONE__INT_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_POINTER);
@@ -2412,7 +2412,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [SELECTION_CHANGE] =
 		gtk_signal_new ("selection_change",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, selection_change),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -2420,7 +2420,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [DOUBLE_CLICK] =
 		gtk_signal_new ("double_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, double_click),
 				e_marshal_NONE__INT_POINTER_INT_POINTER,
 				GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2428,7 +2428,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [RIGHT_CLICK] =
 		gtk_signal_new ("right_click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, right_click),
 				e_marshal_INT__INT_POINTER_INT_POINTER,
 				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2436,7 +2436,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [CLICK] =
 		gtk_signal_new ("click",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, click),
 				e_marshal_INT__INT_POINTER_INT_POINTER,
 				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2444,7 +2444,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [KEY_PRESS] =
 		gtk_signal_new ("key_press",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, key_press),
 				e_marshal_INT__INT_POINTER_INT_POINTER,
 				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2452,7 +2452,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals [START_DRAG] =
 		gtk_signal_new ("start_drag",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, start_drag),
 				e_marshal_NONE__INT_POINTER_INT_POINTER,
 				GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
@@ -2460,7 +2460,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_BEGIN] =
 		gtk_signal_new ("tree_drag_begin",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_begin),
 				e_marshal_NONE__INT_POINTER_INT_POINTER,
 				GTK_TYPE_NONE, 4,
@@ -2471,7 +2471,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_END] =
 		gtk_signal_new ("tree_drag_end",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_end),
 				e_marshal_NONE__INT_POINTER_INT_POINTER,
 				GTK_TYPE_NONE, 4,
@@ -2482,7 +2482,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_DATA_GET] =
 		gtk_signal_new ("tree_drag_data_get",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_get),
 				e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_UINT_UINT,
 				GTK_TYPE_NONE, 7,
@@ -2496,7 +2496,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_DATA_DELETE] =
 		gtk_signal_new ("tree_drag_data_delete",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_delete),
 				e_marshal_NONE__INT_POINTER_INT_POINTER,
 				GTK_TYPE_NONE, 4,
@@ -2508,7 +2508,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_LEAVE] =
 		gtk_signal_new ("tree_drag_leave",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_leave),
 				e_marshal_NONE__INT_POINTER_INT_POINTER_UINT,
 				GTK_TYPE_NONE, 5,
@@ -2520,7 +2520,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_MOTION] =
 		gtk_signal_new ("tree_drag_motion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_motion),
 				e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 7,
@@ -2534,7 +2534,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_DROP] =
 		gtk_signal_new ("tree_drag_drop",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_drop),
 				e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 7,
@@ -2548,7 +2548,7 @@ e_tree_class_init (ETreeClass *class)
 	et_signals[TREE_DRAG_DATA_RECEIVED] =
 		gtk_signal_new ("tree_drag_data_received",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_received),
 				e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_UINT_UINT,
 				GTK_TYPE_NONE, 9,
@@ -2562,14 +2562,14 @@ e_tree_class_init (ETreeClass *class)
 				GTK_TYPE_UINT,
 				GTK_TYPE_UINT);
 
-	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, et_signals, LAST_SIGNAL);
 
 	class->set_scroll_adjustments = set_scroll_adjustments;
 
 	widget_class->set_scroll_adjustments_signal =
 		gtk_signal_new ("set_scroll_adjustments",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETreeClass, set_scroll_adjustments),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index 06f6428fd4..97a00fccd0 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -225,7 +225,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY] =
 		gtk_signal_new ("nonempty",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, nonempty),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -233,7 +233,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
 		gtk_signal_new ("added",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, added),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -241,7 +241,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
 		gtk_signal_new ("full",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, full),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -249,7 +249,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
 		gtk_signal_new ("browse",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, browse),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1,
@@ -258,7 +258,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE] =
 		gtk_signal_new ("unbrowse",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, unbrowse),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -266,13 +266,13 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
 		gtk_signal_new ("activate",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionViewClass, activate),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1,
 				GTK_TYPE_POINTER);
 
-	gtk_object_class_add_signals (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL);
 
 	object_class->destroy = e_completion_view_destroy;
 
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
index 0d72e4690b..5c2dca0dbe 100644
--- a/widgets/text/e-completion.c
+++ b/widgets/text/e-completion.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include "e-completion.h"
+#include "gal/util/e-util.h"
 
 enum {
 	E_COMPLETION_REQUEST_COMPLETION,
@@ -111,7 +112,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_REQUEST_COMPLETION] =
 		gtk_signal_new ("request_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, request_completion),
 				gtk_marshal_NONE__POINTER_INT_INT,
 				GTK_TYPE_NONE, 3,
@@ -120,7 +121,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_BEGIN_COMPLETION] =
 		gtk_signal_new ("begin_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, begin_completion),
 				gtk_marshal_NONE__POINTER_INT_INT,
 				GTK_TYPE_NONE, 3,
@@ -129,7 +130,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_COMPLETION] =
 		gtk_signal_new ("completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, completion),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1,
@@ -138,7 +139,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_RESTART_COMPLETION] =
 		gtk_signal_new ("restart_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, restart_completion),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -146,7 +147,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_CANCEL_COMPLETION] =
 		gtk_signal_new ("cancel_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, cancel_completion),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -154,7 +155,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_END_COMPLETION] =
 		gtk_signal_new ("end_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, end_completion),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -162,7 +163,7 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_CLEAR_COMPLETION] = 
 		gtk_signal_new ("clear_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, clear_completion),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -170,12 +171,12 @@ e_completion_class_init (ECompletionClass *klass)
 	e_completion_signals[E_COMPLETION_LOST_COMPLETION] =
 		gtk_signal_new ("lost_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ECompletionClass, lost_completion),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
-	gtk_object_class_add_signals (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL);
 
 	object_class->destroy = e_completion_destroy;
 }
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index 4345994126..54a9e6e8af 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -1159,7 +1159,7 @@ e_entry_class_init (GtkObjectClass *object_class)
 	e_entry_signals[E_ENTRY_CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EEntryClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -1167,7 +1167,7 @@ e_entry_class_init (GtkObjectClass *object_class)
 	e_entry_signals[E_ENTRY_ACTIVATE] =
 		gtk_signal_new ("activate",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EEntryClass, activate),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -1175,7 +1175,7 @@ e_entry_class_init (GtkObjectClass *object_class)
 	e_entry_signals[E_ENTRY_POPUP] =
 		gtk_signal_new ("popup",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EEntryClass, popup),
 				gtk_marshal_NONE__POINTER_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
@@ -1183,13 +1183,13 @@ e_entry_class_init (GtkObjectClass *object_class)
 	e_entry_signals[E_ENTRY_COMPLETION_POPUP] =
 		gtk_signal_new ("completion_popup",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EEntryClass, completion_popup),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
 
 
-	gtk_object_class_add_signals (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL);
 
 	gtk_object_add_arg_type ("EEntry::model",
 				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL);  
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index af67def74e..97eb2a9a86 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -24,6 +24,7 @@
 #include <gtk/gtksignal.h>
 #include "e-text-model-repos.h"
 #include "e-text-model.h"
+#include "gal/util/e-util.h"
 
 #define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT (obj)->klass))
 
@@ -105,7 +106,7 @@ e_text_model_class_init (ETextModelClass *klass)
 	e_text_model_signals[E_TEXT_MODEL_CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextModelClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -113,7 +114,7 @@ e_text_model_class_init (ETextModelClass *klass)
 	e_text_model_signals[E_TEXT_MODEL_REPOSITION] =
 		gtk_signal_new ("reposition",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextModelClass, reposition),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2,
@@ -122,7 +123,7 @@ e_text_model_class_init (ETextModelClass *klass)
 	e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED] =
 		gtk_signal_new ("object_activated",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextModelClass, object_activated),
 				gtk_marshal_NONE__INT,
 				GTK_TYPE_NONE, 1,
@@ -131,12 +132,12 @@ e_text_model_class_init (ETextModelClass *klass)
 	e_text_model_signals[E_TEXT_MODEL_CANCEL_COMPLETION] =
 		gtk_signal_new ("cancel_completion",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextModelClass, cancel_completion),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 	
-	gtk_object_class_add_signals (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL);
 	
 	/* No default signal handlers. */
 	klass->changed          = NULL;
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index c5b3a7d95e..60bbdcd08a 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -35,6 +35,7 @@
 #include "gal/widgets/e-canvas-utils.h"
 #include "gal/widgets/e-unicode.h"
 #include "gal/util/e-text-event-processor-emacs-like.h"
+#include "gal/util/e-util.h"
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_rgb.h>
 #include <libart_lgpl/art_rgb_bitmap_affine.h>
@@ -223,7 +224,7 @@ e_text_class_init (ETextClass *klass)
 	e_text_signals[E_TEXT_CHANGED] =
 		gtk_signal_new ("changed",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextClass, changed),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -231,7 +232,7 @@ e_text_class_init (ETextClass *klass)
 	e_text_signals[E_TEXT_ACTIVATE] =
 		gtk_signal_new ("activate",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextClass, activate),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -239,7 +240,7 @@ e_text_class_init (ETextClass *klass)
 	e_text_signals[E_TEXT_KEYPRESS] =
 		gtk_signal_new ("keypress",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextClass, keypress),
 				gtk_marshal_NONE__INT_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_UINT, GTK_TYPE_UINT);
@@ -247,12 +248,12 @@ e_text_class_init (ETextClass *klass)
 	e_text_signals[E_TEXT_POPUP] =
 		gtk_signal_new ("popup",
 				GTK_RUN_LAST,
-				object_class->type,
+				E_OBJECT_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (ETextClass, popup),
 				gtk_marshal_NONE__POINTER_INT,
 				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
 
-	gtk_object_class_add_signals (object_class, e_text_signals, E_TEXT_LAST_SIGNAL);
+	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_text_signals, E_TEXT_LAST_SIGNAL);
 
 
 	gtk_object_add_arg_type ("EText::model",