** See bug #54338.

2004-02-20  Not Zed  <NotZed@Ximian.com>

        ** See bug #54338.

        * vfolder-rule.c: instead of overriding the filter-rule's 'source'
        attribute for 'with sources', add a 'with' enum.
        (xml_decode): handle loading old-format files, as well as new
        ones, where the with is a prop on the sources xml.
        (xml_encode): set 'with' on save.
        (rule_copy): copy across with value.
        (get_widget): just hook onto option menu changed, dont bother
        setting up any per-item callbacks.
        (select_source_with_changed): callback to monitor source 'with'
        type.

svn path=/trunk/; revision=24815

1 files changed, 12 insertions, 1 deletions

diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h
index 165e547688..88604be5de 100644
--- a/filter/vfolder-rule.h
+++ b/filter/vfolder-rule.h
@@ -33,12 +33,23 @@
 #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))
 
+/* perhaps should be bits? */
+enum _vfolder_rule_with_t {
+	VFOLDER_RULE_WITH_SPECIFIC,
+	VFOLDER_RULE_WITH_LOCAL,
+	VFOLDER_RULE_WITH_REMOTE_ACTIVE,
+	VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE,
+};
+
 typedef struct _VfolderRule VfolderRule;
 typedef struct _VfolderRuleClass VfolderRuleClass;
 
+typedef enum _vfolder_rule_with_t vfolder_rule_with_t;
+
 struct _VfolderRule {
-	FilterRule parent_object;
+	FilterRule rule;
 	
+	vfolder_rule_with_t with;
 	GList *sources;		/* uri's of the source folders */
 };