Ported.

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

	* filter-filter.c: Ported.

	* filter-source.c (get_widget): Don't use e_utf8_to_gtk_string.

	* filter-option.c (xml_create): Don't use e_utf8_xml1_decode.

	* filter-input.c (xml_encode): Don't use e_utf8_xml1_encode.
	(xml_decode): Don't use e_utf8_xml1_decode.
	(entry_changed): Don't use e_utf8_gtk_entry_get_text.
	(get_widget): Don't use e_utf8_gtk_entry_set_text.

	* filter-file.c (xml_encode): Don't use e_utf8_xml1_encode shit.
	(xml_decode): Don't use e_utf8_xml1_decode.
	(entry_changed): Don't use e_utf8_gtk_entry_get_text.
	(get_widget): Don't use e_utf8_gtk_entry_set_text.

svn path=/trunk/; revision=18570

1 files changed, 22 insertions, 18 deletions

diff --git a/filter/filter-filter.h b/filter/filter-filter.h
index 54c4a144f4..1fcff3fa3a 100644
--- a/filter/filter-filter.h
+++ b/filter/filter-filter.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,42 +20,44 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _FILTER_FILTER_H
 #define _FILTER_FILTER_H
 
 #include "filter-rule.h"
 
-#define FILTER_FILTER(obj)	GTK_CHECK_CAST (obj, filter_filter_get_type (), FilterFilter)
-#define FILTER_FILTER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_filter_get_type (), FilterFilterClass)
-#define IS_FILTER_FILTER(obj)      GTK_CHECK_TYPE (obj, filter_filter_get_type ())
+#define FILTER_TYPE_FILTER            (filter_filter_get_type ())
+#define FILTER_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FILTER_TYPE_FILTER, FilterFilter))
+#define FILTER_FILTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FILTER_TYPE_FILTER, FilterFilterClass))
+#define IS_FILTER_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FILTER_TYPE_FILTER))
+#define IS_FILTER_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_FILTER))
+#define FILTER_FILTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_FILTER, FilterFilterClass))
 
-typedef struct _FilterFilter	FilterFilter;
-typedef struct _FilterFilterClass	FilterFilterClass;
+typedef struct _FilterFilter FilterFilter;
+typedef struct _FilterFilterClass FilterFilterClass;
 
 struct _FilterFilter {
-	FilterRule parent;
-	struct _FilterFilterPrivate *priv;
-
+	FilterRule parent_object;
+	
 	GList *actions;
 };
 
 struct _FilterFilterClass {
 	FilterRuleClass parent_class;
-
+	
 	/* virtual methods */
-
+	
 	/* signals */
 };
 
-guint		filter_filter_get_type	(void);
-FilterFilter	*filter_filter_new	(void);
+GType           filter_filter_get_type (void);
+FilterFilter   *filter_filter_new      (void);
 
 /* methods */
-void		filter_filter_add_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_remove_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_replace_action	(FilterFilter *fr, FilterPart *fp, FilterPart *new);
+void            filter_filter_add_action     (FilterFilter *fr, FilterPart *fp);
+void            filter_filter_remove_action  (FilterFilter *fr, FilterPart *fp);
+void            filter_filter_replace_action (FilterFilter *fr, FilterPart *fp, FilterPart *new);
 
-void		filter_filter_build_action	(FilterFilter *fr, GString *out);
+void            filter_filter_build_action   (FilterFilter *fr, GString *out);
 
 #endif /* ! _FILTER_FILTER_H */
-