Index: src/yelp-base.c
===================================================================
--- src/yelp-base.c	(revision 3219)
+++ src/yelp-base.c	(working copy)
@@ -107,7 +107,7 @@
 static void
 yelp_base_class_init (YelpBaseClass *klass)
 {
-	parent_class = gtk_type_class (PARENT_TYPE);
+	parent_class = g_type_class_peek (PARENT_TYPE);
 
 	main_running = TRUE;
 
Index: src/yelp-settings.c
===================================================================
--- src/yelp-settings.c	(revision 3219)
+++ src/yelp-settings.c	(working copy)
@@ -776,7 +776,8 @@
 	    gdk_color_free (color);
 	}
 
-	gtk_object_sink (GTK_OBJECT (widget));
+	g_object_ref_sink (widget);
+	g_object_unref (widget);
 
 	hls_to_hex (text_h, 
 		    text_l - ((text_l - base_l) * 0.4),
Index: src/yelp-window.h
===================================================================
--- src/yelp-window.h	(revision 3219)
+++ src/yelp-window.h	(working copy)
@@ -31,10 +31,10 @@
 #include "yelp-utils.h"
 
 #define YELP_TYPE_WINDOW		(yelp_window_get_type ())
-#define YELP_WINDOW(obj)		(GTK_CHECK_CAST ((obj), YELP_TYPE_WINDOW, YelpWindow))
-#define YELP_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), YELP_TYPE_WINDOW, YelpWindowClass))
-#define YELP_IS_WINDOW(obj)		(GTK_CHECK_TYPE ((obj), YELP_TYPE_WINDOW))
-#define YELP_IS_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), YELP_TYPE_WINDOW))
+#define YELP_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), YELP_TYPE_WINDOW, YelpWindow))
+#define YELP_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), YELP_TYPE_WINDOW, YelpWindowClass))
+#define YELP_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), YELP_TYPE_WINDOW))
+#define YELP_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), YELP_TYPE_WINDOW))
 
 typedef struct _YelpWindow       YelpWindow;
 typedef struct _YelpWindowClass  YelpWindowClass;
Index: src/yelp-html.h
===================================================================
--- src/yelp-html.h	(revision 3219)
+++ src/yelp-html.h	(working copy)
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define YELP_TYPE_HTML         (yelp_html_get_type ())
-#define YELP_HTML(o)           (GTK_CHECK_CAST ((o), YELP_TYPE_HTML, YelpHtml))
-#define YELP_HTML_CLASS(k)     (GTK_CHECK_FOR_CAST((k), YELP_TYPE_HTML, YelpHtmlClass))
-#define YELP_IS_HTML(o)        (GTK_CHECK_TYPE ((o), YELP_TYPE_HTML))
-#define YELP_IS_HTML_CLASS(k)  (GTK_CHECK_CLASS_TYPE ((k), YELP_TYPE_HTML))
+#define YELP_HTML(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), YELP_TYPE_HTML, YelpHtml))
+#define YELP_HTML_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), YELP_TYPE_HTML, YelpHtmlClass))
+#define YELP_IS_HTML(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), YELP_TYPE_HTML))
+#define YELP_IS_HTML_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), YELP_TYPE_HTML))
 #define YELP_HTML_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), YELP_TYPE_HTML, YelpHtmlClass))
 
 typedef struct _YelpHtml        YelpHtml;
