Ported this too.

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

	* filter-context.c: Ported this too.

	* rule-context.c: Ported to glib2/GObject.

svn path=/trunk/; revision=18502

1 files changed, 18 insertions, 17 deletions

diff --git a/filter/filter-context.h b/filter/filter-context.h
index 93feb3b8b2..157ee6f1de 100644
--- a/filter/filter-context.h
+++ b/filter/filter-context.h
@@ -26,36 +26,37 @@
 
 #include "rule-context.h"
 
-#define FILTER_CONTEXT(obj)	GTK_CHECK_CAST (obj, filter_context_get_type (), FilterContext)
-#define FILTER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_context_get_type (), FilterContextClass)
-#define IS_FILTER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, filter_context_get_type ())
+#define FILTER_TYPE_CONTEXT            (filter_context_get_type ())
+#define FILTER_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FILTER_TYPE_CONTEXT, FilterContext))
+#define FILTER_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FILTER_TYPE_CONTEXT, FilterContextClass))
+#define IS_FILTER_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FILTER_TYPE_CONTEXT))
+#define IS_FILTER_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_CONTEXT))
+#define FILTER_CONTEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_CONTEXT, FilterContextClass))
 
-typedef struct _FilterContext	FilterContext;
-typedef struct _FilterContextClass	FilterContextClass;
+typedef struct _FilterContext FilterContext;
+typedef struct _FilterContextClass FilterContextClass;
 
 struct _FilterContext {
-	RuleContext parent;
-	struct _FilterContextPrivate *priv;
-
+	RuleContext parent_object;
+	
 	GList *actions;
 };
 
 struct _FilterContextClass {
 	RuleContextClass parent_class;
-
+	
 	/* virtual methods */
-
+	
 	/* signals */
 };
 
-guint		filter_context_get_type	(void);
-FilterContext	*filter_context_new	(void);
+GType filter_context_get_type (void);
+FilterContext *filter_context_new (void);
 
 /* methods */
-void		filter_context_add_action(FilterContext *f, FilterPart *action);
-FilterPart	*filter_context_find_action(FilterContext *f, const char *name);
-FilterPart	*filter_context_create_action(FilterContext *f, const char *name);
-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last);
+void filter_context_add_action (FilterContext *fc, FilterPart *action);
+FilterPart *filter_context_find_action (FilterContext *fc, const char *name);
+FilterPart *filter_context_create_action (FilterContext *fc, const char *name);
+FilterPart *filter_context_next_action (FilterContext *fc, FilterPart *last);
 
 #endif /* ! _FILTER_CONTEXT_H */
-