some build fixes

svn path=/trunk/; revision=18575

5 files changed, 22 insertions, 21 deletions

diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index 09cc04115d..c2de04f8a4 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -201,13 +201,13 @@ set_colour (GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColo
 static GtkWidget *
 get_widget (FilterElement *fe)
 {
-	FilterColour *fc = (FilterColour *)fe;
+	FilterColour *fc = (FilterColour *) fe;
 	GnomeColorPicker *cp;
 	
-	cp = (GnomeColorPicker *)gnome_color_picker_new();
-	gnome_color_picker_set_i16(cp, fc->r, fc->g, fc->b, fc->a);
-	gtk_widget_show((GtkWidget *)cp);
-	g_signal_connect (cp, "color_set", set_colour, fe);
+	cp = (GnomeColorPicker *) gnome_color_picker_new ();
+	gnome_color_picker_set_i16 (cp, fc->r, fc->g, fc->b, fc->a);
+	gtk_widget_show ((GtkWidget *) cp);
+	g_signal_connect (cp, "color_set", GTK_SIGNAL_FUNC (set_colour), fe);
 	
 	return (GtkWidget *) cp;
 }
diff --git a/filter/filter-context.c b/filter/filter-context.c
index c1dc6d8545..3e82bc4c39 100644
--- a/filter/filter-context.c
+++ b/filter/filter-context.c
@@ -88,8 +88,6 @@ filter_context_class_init (FilterContextClass *klass)
 static void
 filter_context_init (FilterContext *fc)
 {
-	fc->priv = g_malloc0 (sizeof (*rc->priv));
-	
 	rule_context_add_part_set ((RuleContext *) fc, "partset", filter_part_get_type (),
 				   rule_context_add_part, rule_context_next_part);
 	rule_context_add_part_set ((RuleContext *) fc, "actionset", filter_part_get_type (),
diff --git a/filter/filter-element.c b/filter/filter-element.c
index 376484eb69..2054aeb057 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -1,6 +1,6 @@
 /* -*- 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>
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index 569d36433e..b75213d274 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -35,6 +35,8 @@
 #define IS_FILTER_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_RULE))
 #define FILTER_RULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_RULE, FilterRuleClass))
 
+struct _RuleContext;
+
 typedef struct _FilterRule	FilterRule;
 typedef struct _FilterRuleClass	FilterRuleClass;
 
diff --git a/filter/rule-context.h b/filter/rule-context.h
index 265caecd13..96bc06b00d 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -29,6 +29,7 @@
 #include <gnome-xml/parser.h>
 
 #include "filter-part.h"
+#include "filter-rule.h"
 
 #define RULE_TYPE_CONTEXT            (rule_context_get_type ())
 #define RULE_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), RULE_TYPE_CONTEXT, RuleContext))
@@ -58,7 +59,7 @@ struct _RuleContext {
 	GList *rule_set_list;
 };
 
-typedef void (*RCRegisterFunc) (RuleContext *rc, struct _FilterRule *rule, gpointer user_data);
+typedef void (*RCRegisterFunc) (RuleContext *rc, FilterRule *rule, gpointer user_data);
 
 struct _RuleContextClass {
 	GObjectClass parent_class;
@@ -72,15 +73,15 @@ struct _RuleContextClass {
 	GList *(*rename_uri) (RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp);
 	
 	/* signals */
-	void (*rule_added) (RuleContext *rc, struct _FilterRule *rule);
-	void (*rule_removed) (RuleContext *rc, struct _FilterRule *rule);
+	void (*rule_added) (RuleContext *rc, FilterRule *rule);
+	void (*rule_removed) (RuleContext *rc, FilterRule *rule);
 	void (*changed) (RuleContext *rc);
 };
 
 typedef void (*RCPartFunc) (RuleContext *rc, FilterPart *part);
-typedef void (*RCRuleFunc) (RuleContext *rc, struct _FilterRule *part);
+typedef void (*RCRuleFunc) (RuleContext *rc, FilterRule *part);
 typedef FilterPart * (*RCNextPartFunc) (RuleContext *rc, FilterPart *part);
-typedef struct _FilterRule * (*RCNextRuleFunc) (RuleContext *rc, struct _FilterRule *rule, const char *source);
+typedef FilterRule * (*RCNextRuleFunc) (RuleContext *rc, FilterRule *rule, const char *source);
 
 struct _part_set_map {
 	char *name;
@@ -109,16 +110,16 @@ FilterPart *rule_context_find_part (RuleContext *rc, const char *name);
 FilterPart *rule_context_create_part (RuleContext *rc, const char *name);
 FilterPart *rule_context_next_part (RuleContext *rc, FilterPart *last);
 
-struct _FilterRule *rule_context_next_rule (RuleContext *rc, struct _FilterRule *last, const char *source);
-struct _FilterRule *rule_context_find_rule (RuleContext *rc, const char *name, const char *source);
-struct _FilterRule *rule_context_find_rank_rule (RuleContext *rc, int rank, const char *source);
-void rule_context_add_rule (RuleContext *rc, struct _FilterRule *new);
-void rule_context_add_rule_gui (RuleContext *rc, struct _FilterRule *rule, const char *title, const char *path);
-void rule_context_remove_rule (RuleContext *rc, struct _FilterRule *rule);
+FilterRule *rule_context_next_rule (RuleContext *rc, FilterRule *last, const char *source);
+FilterRule *rule_context_find_rule (RuleContext *rc, const char *name, const char *source);
+FilterRule *rule_context_find_rank_rule (RuleContext *rc, int rank, const char *source);
+void rule_context_add_rule (RuleContext *rc, FilterRule *new);
+void rule_context_add_rule_gui (RuleContext *rc, FilterRule *rule, const char *title, const char *path);
+void rule_context_remove_rule (RuleContext *rc, FilterRule *rule);
 
 /* get/set the rank (position) of a rule */
-void rule_context_rank_rule (RuleContext *rc, struct _FilterRule *rule, int rank);
-int rule_context_get_rank_rule (RuleContext *rc, struct _FilterRule *rule, const char *source);
+void rule_context_rank_rule (RuleContext *rc, FilterRule *rule, int rank);
+int rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const char *source);
 
 /* setup type for set parts */
 void rule_context_add_part_set (RuleContext *rc, const char *setname, int part_type,