1 files changed, 5 insertions, 53 deletions

diff --git a/telepathy-logger/log-iter-pidgin.c b/telepathy-logger/log-iter-pidgin.c
index 86ea0df..a9263d4 100644
--- a/telepathy-logger/log-iter-pidgin.c
+++ b/telepathy-logger/log-iter-pidgin.c
@@ -30,17 +30,13 @@ struct _TplLogIterPidginPriv
   GList *next_event;
   TpAccount *account;
   TplEntity *target;
-  TplLogEventFilter filter;
   TplLogStore *store;
   gint type_mask;
-  gpointer filter_data;
 };
 
 enum
 {
   PROP_ACCOUNT = 1,
-  PROP_FILTER,
-  PROP_FILTER_DATA,
   PROP_STORE,
   PROP_TARGET,
   PROP_TYPE_MASK
@@ -89,12 +85,8 @@ tpl_log_iter_pidgin_get_events (TplLogIter *iter,
         }
 
       event = TPL_EVENT (priv->next_event->data);
-
-      if (priv->filter == NULL || (*priv->filter) (event, priv->filter_data))
-        {
-          events = g_list_prepend (events, g_object_ref (event));
-          i++;
-        }
+      events = g_list_prepend (events, g_object_ref (event));
+      i++;
 
       priv->next_event = g_list_previous (priv->next_event);
     }
@@ -124,8 +116,6 @@ tpl_log_iter_pidgin_rewind (TplLogIter *iter,
   i = 0;
   while (i < num_events)
     {
-      TplEvent *event;
-
       if (e == NULL)
         {
           GList *d;
@@ -159,15 +149,9 @@ tpl_log_iter_pidgin_rewind (TplLogIter *iter,
           e = priv->events;
         }
 
-      event = TPL_EVENT (e->data);
-
-      if (priv->filter == NULL || (*priv->filter) (event, priv->filter_data))
-        {
-          priv->next_event = e;
-          i++;
-        }
-
+      priv->next_event = e;
       e = g_list_next (e);
+      i++;
     }
 }
 
@@ -216,14 +200,6 @@ tpl_log_iter_pidgin_get_property (GObject *object,
       g_value_set_object (value, priv->account);
       break;
 
-    case PROP_FILTER:
-      g_value_set_pointer (value, priv->filter);
-      break;
-
-    case PROP_FILTER_DATA:
-      g_value_set_pointer (value, priv->filter_data);
-      break;
-
     case PROP_STORE:
       g_value_set_object (value, priv->store);
       break;
@@ -259,14 +235,6 @@ tpl_log_iter_pidgin_set_property (GObject *object,
       priv->account = g_value_dup_object (value);
       break;
 
-    case PROP_FILTER:
-      priv->filter = g_value_get_pointer (value);
-      break;
-
-    case PROP_FILTER_DATA:
-      priv->filter_data = g_value_get_pointer (value);
-      break;
-
     case PROP_STORE:
       priv->store = g_value_dup_object (value);
       break;
@@ -315,18 +283,6 @@ tpl_log_iter_pidgin_class_init (TplLogIterPidginClass *klass)
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_ACCOUNT, param_spec);
 
-  param_spec = g_param_spec_pointer ("filter",
-      "Filter",
-      "An optional filter function",
-      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_FILTER, param_spec);
-
-  param_spec = g_param_spec_pointer ("filter-data",
-      "Filter Data",
-      "User data to pass to the filter function",
-      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_FILTER_DATA, param_spec);
-
   param_spec = g_param_spec_object ("store",
       "Store",
       "The storage backend from which the logs are to be retrieved",
@@ -358,16 +314,12 @@ TplLogIter *
 tpl_log_iter_pidgin_new (TplLogStore *store,
     TpAccount *account,
     TplEntity *target,
-    gint type_mask,
-    TplLogEventFilter filter,
-    gpointer filter_data)
+    gint type_mask)
 {
   return g_object_new (TPL_TYPE_LOG_ITER_PIDGIN,
       "store", store,
       "account", account,
       "target", target,
       "type-mask", type_mask,
-      "filter", filter,
-      "filter-data", filter_data,
       NULL);
 }