diff options
| -rw-r--r-- | filter/ChangeLog | 5 | ||||
| -rw-r--r-- | filter/rule-context.c | 23 | ||||
| -rw-r--r-- | filter/rule-context.h | 6 |
3 files changed, 13 insertions, 21 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 8cdf28d743..ca73c950ff 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,8 @@ +2000-10-06 Not Zed <NotZed@HelixCode.com> + + * rule-context.c (load): Remove the stupid on-demand cb shit. + (rule_context_load): And here too. + 2000-09-27 Jeffrey Stedfast <fejj@helixcode.com> * filter-driver.c (filter_driver_run): Now takes an argument to diff --git a/filter/rule-context.c b/filter/rule-context.c index 743e2507c9..be3c2e5540 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -26,8 +26,7 @@ #define d(x) -static int load(RuleContext *f, const char *system, const char *user, - RCRegisterFunc on_demand_cb, gpointer user_data); +static int load(RuleContext *f, const char *system, const char *user); static int save(RuleContext *f, const char *user); static void rule_context_class_init (RuleContextClass *class); @@ -168,25 +167,19 @@ rule_context_set_error(RuleContext *f, char *error) * @f: * @system: * @user: - * @on_demand_cb: An optional callback to allow UI registration of on-demand rules - * @user_data: Extra data for the callback - * + * * Load a rule context from a system and user description file. * * Return value: **/ -int rule_context_load(RuleContext *f, const char *system, const char *user, - RCRegisterFunc on_demand_cb, gpointer user_data ) +int rule_context_load(RuleContext *f, const char *system, const char *user) { d(printf("rule_context: loading %s %s\n", system, user)); - return ((RuleContextClass *)((GtkObject *)f)->klass)->load(f, system, user, - on_demand_cb, - user_data); + return ((RuleContextClass *)((GtkObject *)f)->klass)->load(f, system, user); } -static int load(RuleContext *f, const char *system, const char *user, - RCRegisterFunc on_demand_cb, gpointer user_data) +static int load(RuleContext *f, const char *system, const char *user) { xmlNodePtr set, rule; struct _part_set_map *part_map; @@ -203,8 +196,7 @@ static int load(RuleContext *f, const char *system, const char *user, return -1; } if (strcmp(f->system->root->name, "filterdescription")) { - rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': Invalid format", - system)); + rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': Invalid format", system)); xmlFreeDoc(f->system); f->system = NULL; return -1; @@ -252,9 +244,6 @@ static int load(RuleContext *f, const char *system, const char *user, FilterRule *part = FILTER_RULE(gtk_type_new(rule_map->type)); if (filter_rule_xml_decode(part, rule, f) == 0) { rule_map->append(f, part); - - if (on_demand_cb && part->source == FILTER_SOURCE_DEMAND) - (on_demand_cb) (f, part, user_data); } else { gtk_object_unref((GtkObject *)part); g_warning("Cannot load filter part"); diff --git a/filter/rule-context.h b/filter/rule-context.h index 27078adbcf..dfdca62f28 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -58,8 +58,7 @@ struct _RuleContextClass { GtkObjectClass parent_class; /* virtual methods */ - int (*load)(RuleContext *f, const char *system, const char *user, - RCRegisterFunc on_demand_cb, gpointer user_data); + int (*load)(RuleContext *f, const char *system, const char *user); int (*save)(RuleContext *f, const char *user); /* signals */ @@ -88,8 +87,7 @@ guint rule_context_get_type (void); RuleContext *rule_context_new (void); /* methods */ -int rule_context_load(RuleContext *f, const char *system, const char *user, - RCRegisterFunc on_demand_cb, gpointer user_data); +int rule_context_load(RuleContext *f, const char *system, const char *user); int rule_context_save(RuleContext *f, const char *user); void rule_context_add_part(RuleContext *f, FilterPart *new); |