some build fixes

svn path=/trunk/; revision=18575

1 files changed, 14 insertions, 13 deletions

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,