Ported.

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

	* vfolder-rule.c: Ported.

	* vfolder-editor.c: Ported.

	* vfolder-context.c: Ported.

svn path=/trunk/; revision=18569

1 files changed, 21 insertions, 19 deletions

diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h
index 25073a7a2d..165e547688 100644
--- a/filter/vfolder-rule.h
+++ b/filter/vfolder-rule.h
@@ -1,9 +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.
  *
  *  Author: NotZed <notzed@ximian.com>
+ *          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
@@ -20,41 +20,43 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _VFOLDER_RULE_H
 #define _VFOLDER_RULE_H
 
 #include "filter-rule.h"
 
-#define VFOLDER_RULE(obj)	GTK_CHECK_CAST (obj, vfolder_rule_get_type (), VfolderRule)
-#define VFOLDER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_rule_get_type (), VfolderRuleClass)
-#define IS_VFOLDER_RULE(obj)      GTK_CHECK_TYPE (obj, vfolder_rule_get_type ())
+#define VFOLDER_TYPE_RULE            (vfolder_rule_get_type ())
+#define VFOLDER_RULE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VFOLDER_TYPE_RULE, VfolderRule))
+#define VFOLDER_RULE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VFOLDER_TYPE_RULE, VfolderRuleClass))
+#define IS_VFOLDER_RULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VFOLDER_TYPE_RULE))
+#define IS_VFOLDER_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VFOLDER_TYPE_RULE))
+#define VFOLDER_RULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), VFOLDER_TYPE_RULE, VfolderRuleClass))
 
-typedef struct _VfolderRule	VfolderRule;
-typedef struct _VfolderRuleClass	VfolderRuleClass;
+typedef struct _VfolderRule VfolderRule;
+typedef struct _VfolderRuleClass VfolderRuleClass;
 
 struct _VfolderRule {
-	FilterRule parent;
-	struct _VfolderRulePrivate *priv;
-
+	FilterRule parent_object;
+	
 	GList *sources;		/* uri's of the source folders */
 };
 
 struct _VfolderRuleClass {
 	FilterRuleClass parent_class;
-
+	
 	/* virtual methods */
-
+	
 	/* signals */
 };
 
-guint		vfolder_rule_get_type	(void);
-VfolderRule	*vfolder_rule_new	(void);
+GType        vfolder_rule_get_type (void);
+VfolderRule *vfolder_rule_new      (void);
 
 /* methods */
-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri);
-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last);
+void         vfolder_rule_add_source    (VfolderRule *vr, const char *uri);
+void         vfolder_rule_remove_source (VfolderRule *vr, const char *uri);
+const char  *vfolder_rule_find_source   (VfolderRule *vr, const char *uri);
+const char  *vfolder_rule_next_source   (VfolderRule *vr, const char *last);
 
 #endif /* ! _VFOLDER_RULE_H */
-