4 files changed, 13 insertions, 17 deletions
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 2c47eb47c4..9cda8f1677 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
 #include <gal/util/e-util.h>
 #include "e-text-event-processor-emacs-like.h"
 
@@ -110,10 +109,8 @@ E_MAKE_TYPE (e_text_event_processor_emacs_like,
 static void
 e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass)
 {
-  GtkObjectClass *object_class;
   ETextEventProcessorClass *processor_class;
 
-  object_class = (GtkObjectClass*) klass;
   processor_class = (ETextEventProcessorClass*) klass;
 
   parent_class = g_type_class_ref (PARENT_TYPE);
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 906c0d04b7..1fd74dacfe 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -59,7 +59,7 @@ struct _ETextEventProcessorEmacsLikeClass
 };
 
 
-GtkType    e_text_event_processor_emacs_like_get_type (void);
+GType      e_text_event_processor_emacs_like_get_type (void);
 ETextEventProcessor *e_text_event_processor_emacs_like_new (void);
 
 #ifdef __cplusplus
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index bd05c8cc48..6b974d894e 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -38,8 +38,8 @@ static void e_text_event_processor_get_property (GObject *object,
 						 GValue *value,
 						 GParamSpec *pspec);
 
-#define PARENT_TYPE GTK_TYPE_OBJECT
-static GtkObjectClass *parent_class = NULL;
+#define PARENT_TYPE G_TYPE_OBJECT
+static GObjectClass *parent_class = NULL;
 
 /* The arguments we take */
 enum {
@@ -104,8 +104,8 @@ e_text_event_processor_init (ETextEventProcessor *tep)
 gint
 e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
 {
-	if (E_TEXT_EVENT_PROCESSOR_CLASS (GTK_OBJECT_GET_CLASS (tep))->event)
-		return E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT_GET_CLASS (tep))->event(tep, event);
+	if (E_TEXT_EVENT_PROCESSOR_GET_CLASS(tep)->event)
+		return E_TEXT_EVENT_PROCESSOR_GET_CLASS(tep)->event(tep, event);
 	else
 		return 0;
 }
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 2c55a839e0..21f2550fde 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -37,19 +37,18 @@ extern "C" {
  *
  */
 
-#define E_TEXT_EVENT_PROCESSOR_TYPE			(e_text_event_processor_get_type ())
-#define E_TEXT_EVENT_PROCESSOR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))
-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
-#define E_IS_TEXT_EVENT_PROCESSOR(obj)		        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	        (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-
-
+#define E_TEXT_EVENT_PROCESSOR_TYPE		(e_text_event_processor_get_type ())
+#define E_TEXT_EVENT_PROCESSOR(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))
+#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
+#define E_IS_TEXT_EVENT_PROCESSOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
+#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
+#define E_TEXT_EVENT_PROCESSOR_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
 typedef struct _ETextEventProcessor       ETextEventProcessor;
 typedef struct _ETextEventProcessorClass  ETextEventProcessorClass;
 
 struct _ETextEventProcessor
 {
-	GtkObject parent;
+	GObject parent;
 
 	/* object specific fields */
 	guint allow_newlines : 1;
@@ -67,7 +66,7 @@ struct _ETextEventProcessorClass
 };
 
 
-GtkType    e_text_event_processor_get_type (void);
+GType      e_text_event_processor_get_type (void);
 gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
 
 #ifdef __cplusplus