Index: eel/eel-editable-label.h
===================================================================
--- eel/eel-editable-label.h	(revision 14826)
+++ eel/eel-editable-label.h	(working copy)
@@ -36,11 +36,11 @@
 
 
 #define EEL_TYPE_EDITABLE_LABEL		  (eel_editable_label_get_type ())
-#define EEL_EDITABLE_LABEL(obj)		  (GTK_CHECK_CAST ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabel))
-#define EEL_EDITABLE_LABEL_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
-#define EEL_IS_EDITABLE_LABEL(obj)	  (GTK_CHECK_TYPE ((obj), EEL_TYPE_EDITABLE_LABEL))
+#define EEL_EDITABLE_LABEL(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabel))
+#define EEL_EDITABLE_LABEL_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+#define EEL_IS_EDITABLE_LABEL(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_EDITABLE_LABEL))
 #define EEL_IS_EDITABLE_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_EDITABLE_LABEL))
-#define EEL_EDITABLE_LABEL_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
+#define EEL_EDITABLE_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_EDITABLE_LABEL, EelEditableLabelClass))
        
 
 typedef struct _EelEditableLabel       EelEditableLabel;
Index: eel/eel-canvas.c
===================================================================
--- eel/eel-canvas.c	(revision 14826)
+++ eel/eel-canvas.c	(working copy)
@@ -1631,7 +1631,7 @@
 group_add (EelCanvasGroup *group, EelCanvasItem *item)
 {
 	g_object_ref (GTK_OBJECT (item));
-	gtk_object_sink (GTK_OBJECT (item));
+	g_object_ref_sink (GTK_OBJECT (item));
 
 	if (!group->item_list) {
 		group->item_list = g_list_append (group->item_list, item);
@@ -2080,10 +2080,10 @@
 	canvas->root->canvas = canvas;
 
 	g_object_ref (GTK_OBJECT (canvas->root));
-	gtk_object_sink (GTK_OBJECT (canvas->root));
+	g_object_ref_sink (GTK_OBJECT (canvas->root));
 
 	canvas->root_destroy_id = g_signal_connect (GTK_OBJECT (canvas->root), "destroy",
-						    (GtkSignalFunc) panic_root_destroyed,
+						    (GCallback) panic_root_destroyed,
 						    canvas);
 
 	canvas->need_repick = TRUE;
Index: eel/eel-background.c
===================================================================
--- eel/eel-background.c	(revision 14826)
+++ eel/eel-background.c	(working copy)
@@ -812,7 +812,7 @@
 	/* Store the background in the widget's data. */
 	background = eel_background_new ();
 	g_object_ref (background);
-	gtk_object_sink (GTK_OBJECT (background));
+	g_object_ref_sink (GTK_OBJECT (background));
 	g_object_set_data_full (G_OBJECT (widget), "eel_background",
 				background, g_object_unref);
 
@@ -927,7 +927,7 @@
 	eel_background_set_color (background, "red-blue");
 	eel_background_set_color (background, "red-blue:h");
 
-	gtk_object_sink (GTK_OBJECT (background));
+	g_object_ref_sink (GTK_OBJECT (background));
 }
 
 #endif
Index: eel/eel-canvas.h
===================================================================
--- eel/eel-canvas.h	(revision 14826)
+++ eel/eel-canvas.h	(working copy)
@@ -102,11 +102,11 @@
 };
 
 #define EEL_TYPE_CANVAS_ITEM            (eel_canvas_item_get_type ())
-#define EEL_CANVAS_ITEM(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItem))
-#define EEL_CANVAS_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
-#define EEL_IS_CANVAS_ITEM(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_ITEM))
+#define EEL_CANVAS_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItem))
+#define EEL_CANVAS_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
+#define EEL_IS_CANVAS_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS_ITEM))
 #define EEL_IS_CANVAS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_ITEM))
-#define EEL_CANVAS_ITEM_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
+#define EEL_CANVAS_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass))
 
 
 struct _EelCanvasItem {
@@ -305,11 +305,11 @@
 
 
 #define EEL_TYPE_CANVAS_GROUP            (eel_canvas_group_get_type ())
-#define EEL_CANVAS_GROUP(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroup))
-#define EEL_CANVAS_GROUP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
-#define EEL_IS_CANVAS_GROUP(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_GROUP))
+#define EEL_CANVAS_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroup))
+#define EEL_CANVAS_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
+#define EEL_IS_CANVAS_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS_GROUP))
 #define EEL_IS_CANVAS_GROUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_GROUP))
-#define EEL_CANVAS_GROUP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
+#define EEL_CANVAS_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass))
 
 
 struct _EelCanvasGroup {
@@ -335,11 +335,11 @@
 
 
 #define EEL_TYPE_CANVAS            (eel_canvas_get_type ())
-#define EEL_CANVAS(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS, EelCanvas))
-#define EEL_CANVAS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS, EelCanvasClass))
-#define EEL_IS_CANVAS(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS))
+#define EEL_CANVAS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS, EelCanvas))
+#define EEL_CANVAS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS, EelCanvasClass))
+#define EEL_IS_CANVAS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS))
 #define EEL_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS))
-#define EEL_CANVAS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS, EelCanvasClass))
+#define EEL_CANVAS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS, EelCanvasClass))
 
 
 struct _EelCanvas {
Index: eel/eel-gtk-extensions.c
===================================================================
--- eel/eel-gtk-extensions.c	(revision 14826)
+++ eel/eel-gtk-extensions.c	(working copy)
@@ -394,7 +394,7 @@
 			button,					/* button */
 			event ? event->time : GDK_CURRENT_TIME); /* activate_time */
 
-	gtk_object_sink (GTK_OBJECT (menu));
+	g_object_ref_sink (GTK_OBJECT (menu));
 }
 
 GtkMenuItem *
@@ -519,10 +519,10 @@
 void
 eel_gtk_signal_connect_full_while_alive (GtkObject *object,
 					 const gchar *name,
-					 GtkSignalFunc func,
+					 GCallback func,
 					 GtkCallbackMarshal marshal,
 					 gpointer data,
-					 GtkDestroyNotify destroy_func,
+					 GDestroyNotify destroy_func,
 					 gboolean object_signal,
 					 gboolean after,
 					 GtkObject *alive_object)
@@ -608,7 +608,7 @@
 void
 eel_gtk_signal_connect_while_realized (GtkObject *object,
 					    const char *name,
-					    GtkSignalFunc callback,
+					    GCallback callback,
 					    gpointer callback_data,
 					    GtkWidget *realized_widget)
 {
@@ -992,7 +992,7 @@
 
 	font = pango_font_description_copy (label->style->font_desc);
 
- 	gtk_object_sink (GTK_OBJECT (label));
+ 	g_object_ref_sink (GTK_OBJECT (label));
 
 	return font;
 }
Index: eel/eel-background.h
===================================================================
--- eel/eel-background.h	(revision 14826)
+++ eel/eel-background.h	(working copy)
@@ -51,11 +51,11 @@
 #define EEL_TYPE_BACKGROUND \
 	(eel_background_get_type ())
 #define EEL_BACKGROUND(obj) \
-	(GTK_CHECK_CAST ((obj), EEL_TYPE_BACKGROUND, EelBackground))
+	(G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_BACKGROUND, EelBackground))
 #define EEL_BACKGROUND_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND, EelBackgroundClass))
+	(G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND, EelBackgroundClass))
 #define EEL_IS_BACKGROUND(obj) \
-	(GTK_CHECK_TYPE ((obj), EEL_TYPE_BACKGROUND))
+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_BACKGROUND))
 #define EEL_IS_BACKGROUND_CLASS(klass) \
 	(GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_BACKGROUND))
 
@@ -67,7 +67,7 @@
 	EEL_BACKGROUND_ZOOM
 } EelBackgroundImagePlacement;
 
-GtkType                     eel_background_get_type                         (void);
+GType                     eel_background_get_type                         (void);
 EelBackground *             eel_background_new                              (void);
 
 
Index: eel/eel-gtk-extensions.h
===================================================================
--- eel/eel-gtk-extensions.h	(revision 14826)
+++ eel/eel-gtk-extensions.h	(working copy)
@@ -38,16 +38,16 @@
 /* signals */
 void                  eel_gtk_signal_connect_full_while_alive         (GtkObject            *object,
 								       const gchar          *name,
-								       GtkSignalFunc         func,
+								       GCallback         func,
 								       GtkCallbackMarshal    marshal,
 								       gpointer              data,
-								       GtkDestroyNotify      destroy_func,
+								       GDestroyNotify      destroy_func,
 								       gboolean              object_signal,
 								       gboolean              after,
 								       GtkObject            *alive_object);
 void                  eel_gtk_signal_connect_while_realized           (GtkObject            *object,
 								       const char           *name,
-								       GtkSignalFunc         callback,
+								       GCallback         callback,
 								       gpointer              callback_data,
 								       GtkWidget            *realized_widget);
 
Index: eel/eel-canvas-rect-ellipse.h
===================================================================
--- eel/eel-canvas-rect-ellipse.h	(revision 14826)
+++ eel/eel-canvas-rect-ellipse.h	(working copy)
@@ -65,11 +65,11 @@
 
 
 #define EEL_TYPE_CANVAS_RE            (eel_canvas_re_get_type ())
-#define EEL_CANVAS_RE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_RE, EelCanvasRE))
-#define EEL_CANVAS_RE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
-#define EEL_IS_CANVAS_RE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_RE))
+#define EEL_CANVAS_RE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_RE, EelCanvasRE))
+#define EEL_CANVAS_RE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
+#define EEL_IS_CANVAS_RE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS_RE))
 #define EEL_IS_CANVAS_RE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RE))
-#define EEL_CANVAS_RE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
+#define EEL_CANVAS_RE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_RE, EelCanvasREClass))
 
 
 typedef struct _EelCanvasRE      EelCanvasRE;
@@ -115,11 +115,11 @@
 
 
 #define EEL_TYPE_CANVAS_RECT            (eel_canvas_rect_get_type ())
-#define EEL_CANVAS_RECT(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRect))
-#define EEL_CANVAS_RECT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
-#define EEL_IS_CANVAS_RECT(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_RECT))
+#define EEL_CANVAS_RECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRect))
+#define EEL_CANVAS_RECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
+#define EEL_IS_CANVAS_RECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS_RECT))
 #define EEL_IS_CANVAS_RECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RECT))
-#define EEL_CANVAS_RECT_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
+#define EEL_CANVAS_RECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass))
 
 
 typedef struct _EelCanvasRect EelCanvasRect;
@@ -146,11 +146,11 @@
 
 
 #define EEL_TYPE_CANVAS_ELLIPSE            (eel_canvas_ellipse_get_type ())
-#define EEL_CANVAS_ELLIPSE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipse))
-#define EEL_CANVAS_ELLIPSE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
-#define EEL_IS_CANVAS_ELLIPSE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_CANVAS_ELLIPSE))
+#define EEL_CANVAS_ELLIPSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipse))
+#define EEL_CANVAS_ELLIPSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
+#define EEL_IS_CANVAS_ELLIPSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_CANVAS_ELLIPSE))
 #define EEL_IS_CANVAS_ELLIPSE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_ELLIPSE))
-#define EEL_CANVAS_ELLIPSE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
+#define EEL_CANVAS_ELLIPSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_ELLIPSE, EelCanvasEllipseClass))
 
 
 typedef struct _EelCanvasEllipse EelCanvasEllipse;
Index: eel/eel-image-table.c
===================================================================
--- eel/eel-image-table.c	(revision 14826)
+++ eel/eel-image-table.c	(working copy)
@@ -76,7 +76,7 @@
 /* GtkContainerClass methods */
 static void    eel_image_table_remove               (GtkContainer       *container,
 						     GtkWidget          *widget);
-static GtkType eel_image_table_child_type           (GtkContainer       *container);
+static GType eel_image_table_child_type           (GtkContainer       *container);
 
 /* Private EelImageTable methods */
 static void    image_table_emit_signal              (EelImageTable      *image_table,
@@ -292,7 +292,7 @@
 	EEL_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child));
 }
 
-static GtkType
+static GType
 eel_image_table_child_type (GtkContainer *container)
 {
 	return EEL_TYPE_LABELED_IMAGE;
Index: eel/eel-image-table.h
===================================================================
--- eel/eel-image-table.h	(revision 14826)
+++ eel/eel-image-table.h	(working copy)
@@ -30,9 +30,9 @@
 G_BEGIN_DECLS
 
 #define EEL_TYPE_IMAGE_TABLE            (eel_image_table_get_type ())
-#define EEL_IMAGE_TABLE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_IMAGE_TABLE, EelImageTable))
-#define EEL_IMAGE_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_IMAGE_TABLE, EelImageTableClass))
-#define EEL_IS_IMAGE_TABLE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_IMAGE_TABLE))
+#define EEL_IMAGE_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_IMAGE_TABLE, EelImageTable))
+#define EEL_IMAGE_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_IMAGE_TABLE, EelImageTableClass))
+#define EEL_IS_IMAGE_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_IMAGE_TABLE))
 #define EEL_IS_IMAGE_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_IMAGE_TABLE))
 
 typedef struct EelImageTable		EelImageTable;
@@ -80,7 +80,7 @@
 };
 
 /* Public GtkImageTable methods */
-GtkType    eel_image_table_get_type         (void);
+GType    eel_image_table_get_type         (void);
 GtkWidget *eel_image_table_new              (gboolean       homogeneous);
 GtkWidget *eel_image_table_add_empty_image  (EelImageTable *image_table);
 
Index: eel/eel-gtk-macros.h
===================================================================
--- eel/eel-gtk-macros.h	(revision 14826)
+++ eel/eel-gtk-macros.h	(working copy)
@@ -49,11 +49,11 @@
                                                                               \
 static gpointer parent_class;                                                 \
                                                                               \
-GtkType                                                                       \
+GType                                                                       \
 prefix##_get_type (void)                                                      \
 {                                                                             \
-	GtkType parent_type;                                                  \
-	static GtkType type;                                                  \
+	GType parent_type;                                                  \
+	static GType type;                                                  \
                                                                               \
 	if (type == 0) {                                                      \
 		static GTypeInfo info = {                                     \
Index: eel/eel-labeled-image.h
===================================================================
--- eel/eel-labeled-image.h	(revision 14826)
+++ eel/eel-labeled-image.h	(working copy)
@@ -53,9 +53,9 @@
 G_BEGIN_DECLS
 
 #define EEL_TYPE_LABELED_IMAGE            (eel_labeled_image_get_type ())
-#define EEL_LABELED_IMAGE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_LABELED_IMAGE, EelLabeledImage))
-#define EEL_LABELED_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_LABELED_IMAGE, EelLabeledImageClass))
-#define EEL_IS_LABELED_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_LABELED_IMAGE))
+#define EEL_LABELED_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_LABELED_IMAGE, EelLabeledImage))
+#define EEL_LABELED_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_LABELED_IMAGE, EelLabeledImageClass))
+#define EEL_IS_LABELED_IMAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_LABELED_IMAGE))
 #define EEL_IS_LABELED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_LABELED_IMAGE))
 
 typedef struct EelLabeledImage		  EelLabeledImage;
@@ -79,7 +79,7 @@
 };
 
 /* Public GtkLabeledImage methods */
-GtkType         eel_labeled_image_get_type                         (void);
+GType         eel_labeled_image_get_type                         (void);
 GtkWidget *     eel_labeled_image_new                              (const char              *text,
 								    GdkPixbuf               *pixbuf);
 GtkWidget *     eel_labeled_image_new_from_file_name               (const char              *text,
Index: eel/eel-wrap-table.c
===================================================================
--- eel/eel-wrap-table.c	(revision 14826)
+++ eel/eel-wrap-table.c	(working copy)
@@ -89,7 +89,7 @@
 							  gboolean             include_internals,
 							  GtkCallback          callback,
 							  gpointer             callback_data);
-static GtkType       eel_wrap_table_child_type           (GtkContainer        *container);
+static GType         eel_wrap_table_child_type           (GtkContainer        *container);
 
 
 /* Private EelWrapTable methods */
@@ -477,7 +477,7 @@
 	}
 }
 
-static GtkType
+static GType
 eel_wrap_table_child_type (GtkContainer   *container)
 {
 	return GTK_TYPE_WIDGET;
Index: eel/eel-wrap-table.h
===================================================================
--- eel/eel-wrap-table.h	(revision 14826)
+++ eel/eel-wrap-table.h	(working copy)
@@ -31,9 +31,9 @@
 G_BEGIN_DECLS
 
 #define EEL_TYPE_WRAP_TABLE            (eel_wrap_table_get_type ())
-#define EEL_WRAP_TABLE(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_WRAP_TABLE, EelWrapTable))
-#define EEL_WRAP_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_WRAP_TABLE, EelWrapTableClass))
-#define EEL_IS_WRAP_TABLE(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_WRAP_TABLE))
+#define EEL_WRAP_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_WRAP_TABLE, EelWrapTable))
+#define EEL_WRAP_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_WRAP_TABLE, EelWrapTableClass))
+#define EEL_IS_WRAP_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_WRAP_TABLE))
 #define EEL_IS_WRAP_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_WRAP_TABLE))
 
 typedef struct EelWrapTable	       EelWrapTable;
@@ -62,7 +62,7 @@
 } EelJustification;
 
 /* Public GtkWrapTable methods */
-GtkType          eel_wrap_table_get_type                  (void);
+GType          eel_wrap_table_get_type                  (void);
 GtkWidget *      eel_wrap_table_new                       (gboolean            homogeneous);
 void             eel_wrap_table_set_x_spacing             (EelWrapTable       *wrap_table,
 							   guint               x_spacing);
Index: eel/eel-background-box.h
===================================================================
--- eel/eel-background-box.h	(revision 14826)
+++ eel/eel-background-box.h	(working copy)
@@ -31,9 +31,9 @@
 G_BEGIN_DECLS
 
 #define EEL_TYPE_BACKGROUND_BOX            (eel_background_box_get_type ())
-#define EEL_BACKGROUND_BOX(obj)            (GTK_CHECK_CAST ((obj), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBox))
-#define EEL_BACKGROUND_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBoxClass))
-#define EEL_IS_BACKGROUND_BOX(obj)         (GTK_CHECK_TYPE ((obj), EEL_TYPE_BACKGROUND_BOX))
+#define EEL_BACKGROUND_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBox))
+#define EEL_BACKGROUND_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_BACKGROUND_BOX, EelBackgroundBoxClass))
+#define EEL_IS_BACKGROUND_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_BACKGROUND_BOX))
 #define EEL_IS_BACKGROUND_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EEL_TYPE_BACKGROUND_BOX))
 
 typedef struct EelBackgroundBox	       EelBackgroundBox;
@@ -51,7 +51,7 @@
 	GtkEventBoxClass parent_class;
 };
 
-GtkType    eel_background_box_get_type (void);
+GType    eel_background_box_get_type (void);
 GtkWidget *eel_background_box_new      (void);
 
 G_END_DECLS
Index: eel/eel-debug-drawing.c
===================================================================
--- eel/eel-debug-drawing.c	(revision 14826)
+++ eel/eel-debug-drawing.c	(working copy)
@@ -49,13 +49,13 @@
  * for pixbuf debugging is to debug EelImage itself.
  */
 #define DEBUG_TYPE_PIXBUF_VIEWER (debug_pixbuf_viewer_get_type ())
-#define DEBUG_PIXBUF_VIEWER(obj) (GTK_CHECK_CAST ((obj), DEBUG_TYPE_PIXBUF_VIEWER, DebugPixbufViewer))
-#define DEBUG_IS_PIXBUF_VIEWER(obj) (GTK_CHECK_TYPE ((obj), DEBUG_TYPE_PIXBUF_VIEWER))
+#define DEBUG_PIXBUF_VIEWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEBUG_TYPE_PIXBUF_VIEWER, DebugPixbufViewer))
+#define DEBUG_IS_PIXBUF_VIEWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEBUG_TYPE_PIXBUF_VIEWER))
 
 typedef struct DebugPixbufViewer DebugPixbufViewer;
 typedef struct DebugPixbufViewerClass DebugPixbufViewerClass;
 
-static GtkType debug_pixbuf_viewer_get_type   (void);
+static GType debug_pixbuf_viewer_get_type   (void);
 static void    debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer,
 					       GdkPixbuf         *pixbuf);
 
Index: eel/eel-stock-dialogs.c
===================================================================
--- eel/eel-stock-dialogs.c	(revision 14826)
+++ eel/eel-stock-dialogs.c	(working copy)
@@ -120,7 +120,7 @@
 
 	g_free (wait->wait_message);
 	if (wait->parent_window != NULL) {
-		gtk_widget_unref (GTK_WIDGET (wait->parent_window));
+		g_object_unref (GTK_WIDGET (wait->parent_window));
 	}
 	if (wait->timeout_handler_id != 0) {
 		g_source_remove (wait->timeout_handler_id);
@@ -260,7 +260,7 @@
 	wait->parent_window = parent_window;
 	
 	if (parent_window != NULL) {
-		gtk_widget_ref (GTK_WIDGET (parent_window));
+		g_object_ref (GTK_WIDGET (parent_window));
 	}
 
 	/* Start the timer. */
Index: eel/eel-types.c
===================================================================
--- eel/eel-types.c	(revision 14826)
+++ eel/eel-types.c	(working copy)
@@ -35,13 +35,13 @@
 eel_type_init (void)
 {
 	int i;
-	GtkType type_id;
+	GType type_id;
 	static gboolean initialized = FALSE;
 	
 	static struct {
 		const gchar *type_name;
-		GtkType *type_id;
-		GtkType parent;
+		GType *type_id;
+		GType parent;
 		gconstpointer pointer1;
 		gpointer pointer2;
 	} builtin_info[EEL_TYPE_N_BUILTINS] = {
Index: eel/eel-editable-label.c
===================================================================
--- eel/eel-editable-label.c	(revision 14826)
+++ eel/eel-editable-label.c	(working copy)
@@ -3117,7 +3117,7 @@
 
   g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
   g_signal_connect (GTK_OBJECT (menuitem), "activate",
-		    GTK_SIGNAL_FUNC (activate_cb), label);
+		    G_CALLBACK (activate_cb), label);
 
   gtk_widget_set_sensitive (menuitem, sensitive);
   
@@ -3216,7 +3216,7 @@
   
       menuitem = gtk_menu_item_new_with_label (_("Select All"));
       g_signal_connect_object (GTK_OBJECT (menuitem), "activate",
-			       GTK_SIGNAL_FUNC (eel_editable_label_select_all), label,
+			       G_CALLBACK (eel_editable_label_select_all), label,
 			       G_CONNECT_SWAPPED);
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
