Ported to GObject.

2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>

	* filter-element.c: Ported to GObject.

	* filter-input.c: Same.

	* filter-code.c: This too.

	* filter-colour.c: And this.

svn path=/trunk/; revision=18492

1 files changed, 77 insertions, 86 deletions

diff --git a/filter/filter-input.c b/filter/filter-input.c
index 9be03e66c1..693c56fef0 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -1,7 +1,9 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Ximian Inc.
+ *  Copyright (C) 2000-2002 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -18,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -25,9 +28,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <regex.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
 
+#include <gtk/gtkwidget.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-dialog.h>
@@ -40,97 +42,85 @@
 #define d(x) 
 
 static gboolean validate (FilterElement *fe);
-static int input_eq(FilterElement *fe, FilterElement *cm);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_input_class_init	(FilterInputClass *class);
-static void filter_input_init	(FilterInput *gspaper);
-static void filter_input_finalise	(GtkObject *obj);
+static int input_eq (FilterElement *fe, FilterElement *cm);
+static void xml_create (FilterElement *fe, xmlNodePtr node);
+static xmlNodePtr xml_encode (FilterElement *fe);
+static int xml_decode (FilterElement *fe, xmlNodePtr node);
+static GtkWidget *get_widget (FilterElement *fe);
+static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
+static void format_sexp (FilterElement *, GString *);
 
-#define _PRIVATE(x) (((FilterInput *)(x))->priv)
+static void filter_input_class_init (FilterInputClass *klass);
+static void filter_input_init (FilterInput *fi);
+static void filter_input_finalise (GObject *obj);
 
-struct _FilterInputPrivate {
-};
 
 static FilterElementClass *parent_class;
 
-enum {
-	LAST_SIGNAL
-};
 
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
+GType
 filter_input_get_type (void)
 {
-	static guint type = 0;
+	static GType type = 0;
 	
 	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterInput",
-			sizeof(FilterInput),
-			sizeof(FilterInputClass),
-			(GtkClassInitFunc)filter_input_class_init,
-			(GtkObjectInitFunc)filter_input_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
+		static const GTypeInfo info = {
+			sizeof (FilterInputClass),
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc) filter_input_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (FilterInput),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) filter_input_init,
 		};
 		
-		type = gtk_type_unique(filter_element_get_type (), &type_info);
+		type = g_type_register_static (FILTER_TYPE_ELEMENT, "FilterInput", &info, 0);
 	}
 	
 	return type;
 }
 
 static void
-filter_input_class_init (FilterInputClass *class)
+filter_input_class_init (FilterInputClass *klass)
 {
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	FilterElementClass *fe_class = FILTER_ELEMENT_CLASS (klass);
+	
+	parent_class = g_type_class_ref (FILTER_TYPE_ELEMENT);
+	
 	object_class->finalize = filter_input_finalise;
-
+	
 	/* override methods */
-	filter_element->validate = validate;
-	filter_element->eq = input_eq;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
+	fe_class->validate = validate;
+	fe_class->eq = input_eq;
+	fe_class->xml_create = xml_create;
+	fe_class->xml_encode = xml_encode;
+	fe_class->xml_decode = xml_decode;
+	fe_class->get_widget = get_widget;
+	fe_class->build_code = build_code;
+	fe_class->format_sexp = format_sexp;
 }
 
 static void
-filter_input_init (FilterInput *o)
+filter_input_init (FilterInput *fi)
 {
-	o->priv = g_malloc0 (sizeof (*o->priv));
+	;
 }
 
 static void
 filter_input_finalise (GtkObject *obj)
 {
-	FilterInput *o = (FilterInput *)obj;
-
-	xmlFree (o->type);
-	g_list_foreach(o->values, (GFunc)g_free, NULL);
-	g_list_free(o->values);
-
-	g_free(o->priv);
+	FilterInput *fi = (FilterInput *) obj;
 	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
+	xmlFree (fi->type);
+	g_list_foreach (fi->values, (GFunc)g_free, NULL);
+	g_list_free (fi->values);
+	
+	g_free (fi->priv);
+	
+        G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /**
@@ -143,18 +133,20 @@ filter_input_finalise (GtkObject *obj)
 FilterInput *
 filter_input_new (void)
 {
-	FilterInput *o = (FilterInput *)gtk_type_new(filter_input_get_type ());
-	return o;
+	return (FilterInput *) g_object_new (FILTER_TYPE_INPUT, NULL, NULL);
 }
 
 FilterInput *
 filter_input_new_type_name (const char *type)
 {
-	FilterInput *o = filter_input_new ();
-	o->type = xmlStrdup (type);
+	FilterInput *fi;
 	
-	d(printf("new type %s = %p\n", type, o));
-	return o;
+	fi = filter_input_new ();
+	fi->type = xmlStrdup (type);
+	
+	d(printf("new type %s = %p\n", type, fi));
+	
+	return fi;
 }
 
 void
@@ -180,7 +172,7 @@ validate (FilterElement *fe)
 	
 	if (fi->values && !strcmp (fi->type, "regex")) {
 		regex_t regexpat;        /* regex patern */
-		gint regerr;
+		int regerr;
 		char *text;
 		
 		text = fi->values->data;
@@ -188,7 +180,7 @@ validate (FilterElement *fe)
 		regerr = regcomp (&regexpat, text, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
 		if (regerr) {
 			GtkWidget *dialog;
-			gchar *regmsg, *errmsg;
+			char *regmsg, *errmsg;
 			size_t reglen;
 			
 			/* regerror gets called twice to get the full error string 
@@ -216,35 +208,34 @@ validate (FilterElement *fe)
 }
 
 static int
-list_eq(GList *al, GList *bl)
+list_eq (GList *al, GList *bl)
 {
 	int truth = TRUE;
-
+	
 	while (truth && al && bl) {
-		truth = strcmp((char *)al->data, (char *)bl->data) == 0;
+		truth = strcmp ((char *) al->data, (char *) bl->data) == 0;
 		al = al->next;
 		bl = bl->next;
 	}
-
+	
 	return truth && al == NULL && bl == NULL;
 }
 
 static int
-input_eq(FilterElement *fe, FilterElement *cm)
+input_eq (FilterElement *fe, FilterElement *cm)
 {
 	FilterInput *fi = (FilterInput *)fe, *ci = (FilterInput *)cm;
-
-	return ((FilterElementClass *)(parent_class))->eq(fe, cm)
-		&& strcmp(fi->type, ci->type) == 0
-		&& list_eq(fi->values, ci->values);
+	
+	return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm)
+		&& strcmp (fi->type, ci->type) == 0
+		&& list_eq (fi->values, ci->values);
 }
 
 static void
 xml_create (FilterElement *fe, xmlNodePtr node)
 {
 	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-	
+        FILTER_ELEMENT_CLASS (parent_class)->xml_create (fe, node);
 }
 
 static xmlNodePtr
@@ -304,7 +295,7 @@ xml_decode (FilterElement *fe, xmlNodePtr node)
 				xmlFree (str);
 			} else
 				decstr = g_strdup("");
-
+			
 			d(printf ("  '%s'\n", decstr));
 			fi->values = g_list_append (fi->values, decstr);
 		} else {
@@ -323,7 +314,7 @@ entry_changed (GtkEntry *entry, FilterElement *fe)
 	FilterInput *fi = (FilterInput *)fe;
 	GList *l;
 	
-	new = e_utf8_gtk_entry_get_text(entry);
+	new = e_utf8_gtk_entry_get_text (entry);
 	
 	/* NOTE: entry only supports a single value ... */
 	l = fi->values;
@@ -348,7 +339,7 @@ get_widget (FilterElement *fe)
 		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), fi->values->data);
 	}
 	
-	gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe);
+	g_signal_connect (entry, "changed", entry_changed, fe);
 	
 	return entry;
 }
@@ -356,7 +347,7 @@ get_widget (FilterElement *fe)
 static void
 build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
 {
-	return;
+	;
 }
 
 static void