From 19a3979cf43d3b598b6c71a31ae9f454f0f1f416 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 10 Jun 2008 12:24:53 +0200
Subject: [PATCH] Adapted MMFilterParam to the new operator types and add
 getters.

---
 src/mm-filter-param.c | 30 ++++++++++++++++++++++++------
 src/mm-filter-param.h | 25 ++++++++++++++-----------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/mm-filter-param.c b/src/mm-filter-param.c
index d052e80..44409fa 100644
--- a/src/mm-filter-param.c
+++ b/src/mm-filter-param.c
@@ -27,11 +27,29 @@
 struct _MMFilterParam {
   GValue *value;
   MMAttribute *attribute;
-  MMLogicOperator op;
+  MMComparisionOperator op;
 };
 
 /* public methods */
 
+MMAttribute *
+mm_filter_param_get_attribute (MMFilterParam *fp)
+{
+  return fp->attribute;
+}
+
+MMComparisionOperator
+mm_filter_param_get_operator (MMFilterParam *fp)
+{
+  return fp->op;
+}
+
+GValue *
+mm_filter_param_get_value (MMFilterParam *fp)
+{
+  return fp->value;
+}
+
 void
 mm_filter_param_free (MMFilterParam *fp)
 {
@@ -72,8 +90,8 @@ mm_filter_param_set_value (MMFilterParam *fp,
 }
 
 void
-mm_filter_param_set_logic (MMFilterParam *fp,
-                           MMLogicOperator op)
+mm_filter_param_set_comparision (MMFilterParam *fp,
+                                 MMComparisionOperator op)
 {
   fp->op = op;
 }
@@ -81,7 +99,7 @@ mm_filter_param_set_logic (MMFilterParam *fp,
 void
 mm_filter_param_clear (MMFilterParam *fp)
 {
-  fp->op = MM_LOGIC_NONE;
+  fp->op = MM_COMP_NONE;
   fp->attribute = NULL;
   g_value_unset (fp->value);
 }
@@ -89,7 +107,7 @@ mm_filter_param_clear (MMFilterParam *fp)
 MMFilterParam *
 mm_filter_param_new (MMAttribute *attribute,
                      GValue      *value,
-                     MMLogicOperator logic)
+                     MMComparisionOperator op)
 {
   MMFilterParam *fp;
   GType attribute_type = mm_attribute_get_type (attribute);
@@ -99,7 +117,7 @@ mm_filter_param_new (MMAttribute *attribute,
   }
 
   fp = g_slice_new0 (MMFilterParam);
-  fp->op = logic;
+  fp->op = op;
   fp->attribute = attribute;
   fp->value = g_value_init (fp->value, attribute_type);
   g_value_copy (value, fp->value);
diff --git a/src/mm-filter-param.h b/src/mm-filter-param.h
index 39a0c86..651cf1b 100644
--- a/src/mm-filter-param.h
+++ b/src/mm-filter-param.h
@@ -28,16 +28,19 @@ typedef struct _MMFilterParam MMFilterParam;
 
 /* public methods */
 
-MMFilterParam * mm_filter_param_new           (MMAttribute    *attribute,
-                                               GValue         *value
-                                               MMLogicOperator logic);
-void            mm_filter_param_set_attribute (MMFilterParam  *filter_param,
-                                               MMAttribute    *attribute);
-void            mm_filter_param_set_logic     (MMFilterParam  *filter_param,
-                                               MMLogicOperator logic);
-void            mm_filter_param_set_value     (MMFilterParam  *filter_param,
-                                               GValue         *value);
-void            mm_filter_param_clear         (MMFilterParam  *filter_param);
-void            mm_filter_param_free          (MMFilterParam  *filter_param);
+MMFilterParam *       mm_filter_param_new           (MMAttribute          *attribute,
+                                                     GValue               *value
+                                                     MMComparisionOperator op);
+void                  mm_filter_param_set_attribute (MMFilterParam  *filter_param,
+                                                     MMAttribute    *attribute);
+void                  mm_filter_param_set_operator  (MMFilterParam        *filter_param,
+                                                     MMComparisionOperator logic);
+void                  mm_filter_param_set_value     (MMFilterParam  *filter_param,
+                                                     GValue         *value);
+GValue *              mm_filter_param_get_value     (MMFilterParam  *filter_param);
+MMAttribute *         mm_filter_param_get_attribute (MMFilterParam  *filter_param);
+MMComparisionOperator mm_filter_param_get_operator  (MMFilterParam  *filter_param);
+void                  mm_filter_param_clear         (MMFilterParam  *filter_param);
+void                  mm_filter_param_free          (MMFilterParam  *filter_param);
                                                
 #endif /* __MM_FILTER_PARAM_H__ */
-- 
2.11.4.GIT