Also ported.

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

	* filter-editor.c: Also ported.

	* rule-editor.c: Ported to gtk2 and removed unnecessary e_utf8 snot.

svn path=/trunk/; revision=18539

1 files changed, 35 insertions, 29 deletions

diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index f054023c87..df940db3e5 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -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,47 +20,55 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _RULE_EDITOR_H
 #define _RULE_EDITOR_H
 
 #include <gtk/gtklist.h>
+#include <glade/glade.h>
 #include <libgnomeui/gnome-dialog.h>
 
-#define RULE_EDITOR(obj)	GTK_CHECK_CAST (obj, rule_editor_get_type (), RuleEditor)
-#define RULE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, rule_editor_get_type (), RuleEditorClass)
-#define IS_RULE_EDITOR(obj)      GTK_CHECK_TYPE (obj, rule_editor_get_type ())
+#include "rule-context.h"
+#include "filter-rule.h"
+
+#define RULE_TYPE_EDITOR            (rule_editor_get_type ())
+#define RULE_EDITOR(obj)            (GTK_CHECK_CAST ((obj), RULE_TYPE_EDITOR, RuleEditor))
+#define RULE_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), RULE_TYPE_EDITOR, RuleEditorClass))
+#define IS_RULE_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), RULE_TYPE_EDITOR))
+#define IS_RULE_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), RULE_TYPE_EDITOR))
+#define RULE_EDITOR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), RULE_TYPE_EDITOR, RuleEditorClass))
 
 typedef struct _RuleEditor	RuleEditor;
 typedef struct _RuleEditorClass	RuleEditorClass;
 typedef struct _RuleEditorUndo	RuleEditorUndo;
 
 struct _RuleEditor {
-	GnomeDialog parent;
-
+	GnomeDialog parent_object;
+	
 	GtkList *list;
-	struct _RuleContext *context;
-	struct _FilterRule *current;
-	struct _FilterRule *edit;	/* for editing/adding rules, so we only do 1 at a time */
+	RuleContext *context;
+	FilterRule *current;
+	FilterRule *edit;	/* for editing/adding rules, so we only do 1 at a time */
 	
 	GtkWidget *dialog;
 	
 	char *source;
-
+	
 	struct _RuleEditorUndo *undo_log;	/* cancel/undo log */
 	unsigned int undo_active:1; /* we're performing undo */
-
+	
 	struct _RuleEditorPrivate *priv;
 };
 
 struct _RuleEditorClass {
 	GnomeDialogClass parent_class;
-
+	
 	/* virtual methods */
-	void (*set_sensitive)(RuleEditor *);
-	void (*set_source)(RuleEditor *, const char *source);
-
-	struct _FilterRule *(*create_rule)(RuleEditor *);
-
+	void (*set_sensitive) (RuleEditor *);
+	void (*set_source) (RuleEditor *, const char *source);
+	
+	FilterRule *(*create_rule) (RuleEditor *);
+	
 	/* signals */
 };
 
@@ -71,26 +81,22 @@ enum {
 
 struct _RuleEditorUndo {
 	struct _RuleEditorUndo *next;
-
+	
 	unsigned int type;
-	struct _FilterRule *rule;
+	FilterRule *rule;
 	int rank;
 	int newrank;
 };
 
-struct _GladeXML;
-struct _RuleContext;
-
-guint		rule_editor_get_type	(void);
-RuleEditor	*rule_editor_new	(struct _RuleContext *, const char *source);
-void		rule_editor_construct   (RuleEditor *re, struct _RuleContext *context, struct _GladeXML *gui, const char *source);
+GtkType rule_editor_get_type (void);
+RuleEditor *rule_editor_new (struct _RuleContext *, const char *source);
+void rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source);
 
 /* methods */
-void rule_editor_set_source(RuleEditor *re, const char *source);
+void rule_editor_set_source (RuleEditor *re, const char *source);
 /* calculates the sensitivity of the editor */
-void rule_editor_set_sensitive(RuleEditor *re);
+void rule_editor_set_sensitive (RuleEditor *re);
 /* used internally to create a new rule appropriate for the editor */
-struct _FilterRule *rule_editor_create_rule(RuleEditor *re);
+struct _FilterRule *rule_editor_create_rule (RuleEditor *re);
 
 #endif /* ! _RULE_EDITOR_H */
-