[evolution-patches] e-sexp cleanup patch

[Jeffrey Stedfast <fejj ximian com>]

Doesn't fix any bugs, nor does it affect absolutely anything... except
to finish the unused port to GObject from GtkObject.

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.377
diff -u -r1.377 ChangeLog
--- ChangeLog	9 Apr 2003 18:41:17 -0000	1.377
+++ ChangeLog	14 Apr 2003 22:07:32 -0000
@@ -1,3 +1,8 @@
+2003-04-14  Jeffrey Stedfast  <fejj ximian com>
+
+	* e-sexp.c: Finished an #if 0'd out port to GObject from an #if
+	0'd out GtkObject subclassing.
+
 2003-04-09  Jeffrey Stedfast  <fejj ximian com>
 
 	* e-host-utils.c (e_gethostbyaddr_r): Change the 'len' argument to
Index: e-sexp.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-sexp.h,v
retrieving revision 1.10
diff -u -r1.10 e-sexp.h
--- e-sexp.h	19 Mar 2003 19:02:14 -0000	1.10
+++ e-sexp.h	14 Apr 2003 22:07:32 -0000
@@ -12,7 +12,7 @@
 #include <glib-object.h>
 #endif
 
-#ifdef E_SEXP_IS_GTK_OBJECT
+#ifdef E_SEXP_IS_G_OBJECT
 #define E_TYPE_SEXP            (e_sexp_get_type ())
 #define E_SEXP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SEXP, ESExp))
 #define E_SEXP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SEXP, ESExpClass))
@@ -121,7 +121,7 @@
 };
 
 struct _ESExpClass {
-#ifdef E_SEXP_IS_GTK_OBJECT
+#ifdef E_SEXP_IS_G_OBJECT
 	GObjectClass parent_class;
 #else
 	int dummy;
Index: e-sexp.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-sexp.c,v
retrieving revision 1.31
diff -u -r1.31 e-sexp.c
--- e-sexp.c	19 Mar 2003 19:49:44 -0000	1.31
+++ e-sexp.c	14 Apr 2003 22:07:32 -0000
@@ -105,7 +105,7 @@
 
 static void parse_dump_term(struct _ESExpTerm *t, int depth);
 
-#ifdef E_SEXP_IS_GTK_OBJECT
+#ifdef E_SEXP_IS_G_OBJECT
 static GObjectClass *parent_class;
 #endif
 
@@ -1028,17 +1028,15 @@
 
 static void e_sexp_finalise(void *);
 
-#ifdef E_SEXP_IS_GTK_OBJECT
+#ifdef E_SEXP_IS_G_OBJECT
 static void
-e_sexp_class_init (ESExpClass *class)
+e_sexp_class_init (ESExpClass *klass)
 {
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize = e_sexp_finalise;
 
-	parent_class = gtk_type_class (gtk_object_get_type ());
+	parent_class = g_type_class_ref (g_object_get_type ());
 }
 #endif
 
@@ -1088,8 +1086,8 @@
 	g_scanner_scope_foreach_symbol(s->scanner, 0, free_symbol, 0);
 	g_scanner_destroy(s->scanner);
 
-#ifdef E_SEXP_IS_GTK_OBJECT
-	((GtkObjectClass *)(parent_class))->finalize((GtkObject *)o);
+#ifdef E_SEXP_IS_G_OBJECT
+	G_OBJECT_CLASS (parent_class)->finalize (o);
 #endif
 }