[next] telepathy-glib: base-client: remove not vardict filter API

[Guillaume Desmottes]

Module: telepathy-glib
Branch: next
Commit: fb15cc397e363427602a77995e9b9dbba0a67544
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=fb15cc397e363427602a77995e9b9dbba0a67544

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Feb 18 16:44:31 2014 +0100

base-client: remove not vardict filter API

take_*_filter() are still used to implement the vardict API for now so they
are now static.

---

 .../telepathy-glib/telepathy-glib-sections.txt     |    6 --
 telepathy-glib/base-client.c                       |  100 ++------------------
 telepathy-glib/base-client.h                       |   12 ---
 3 files changed, 6 insertions(+), 112 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 5adf30e..5635724 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4532,24 +4532,18 @@ TpDebugSenderPrivate
 <TITLE>base-client</TITLE>
 TpBaseClient
 TpBaseClientClass
-tp_base_client_add_observer_filter
 tp_base_client_add_observer_filter_vardict
-tp_base_client_take_observer_filter
 tp_base_client_set_observer_recover
 tp_base_client_set_observer_delay_approvers
 TpBaseClientClassObserveChannelImpl
 tp_base_client_implement_observe_channel
-tp_base_client_add_approver_filter
 tp_base_client_add_approver_filter_vardict
-tp_base_client_take_approver_filter
 TpBaseClientClassAddDispatchOperationImpl
 tp_base_client_implement_add_dispatch_operation
 tp_base_client_add_handler_capabilities
 tp_base_client_add_handler_capabilities_varargs
 tp_base_client_add_handler_capability
-tp_base_client_add_handler_filter
 tp_base_client_add_handler_filter_vardict
-tp_base_client_take_handler_filter
 tp_base_client_be_a_handler
 TpBaseClientClassHandleChannelImpl
 tp_base_client_implement_handle_channel
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 4baf0e1..60736d4 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -317,44 +317,7 @@ tp_base_client_dup_account (TpBaseClient *self,
       path, NULL, error);
 }
 
-static GHashTable *
-_tp_base_client_copy_filter (GHashTable *filter)
-{
-  GHashTable *copy;
-
-  copy = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-      (GDestroyNotify) tp_g_value_slice_free);
-  tp_g_hash_table_update (copy, filter, (GBoxedCopyFunc) g_strdup,
-      (GBoxedCopyFunc) tp_g_value_slice_dup);
-  return copy;
-}
-
-/**
- * tp_base_client_add_observer_filter:
- * @self: a #TpBaseClient
- * @filter: (transfer none) (element-type utf8 GObject.Value):
- * a %TP_HASH_TYPE_CHANNEL_CLASS
- *
- * Register a new channel class as Observer.ObserverChannelFilter.
- * The #TpBaseClientClass.observe_channel virtual method will be called
- * whenever a new channel's properties match the ones in @filter.
- *
- * This method may only be called before tp_base_client_register() is
- * called, and may only be called on objects whose class implements
- * #TpBaseClientClass.observe_channel.
- *
- * Since: 0.11.5
- */
-void
-tp_base_client_add_observer_filter (TpBaseClient *self,
-    GHashTable *filter)
-{
-  g_return_if_fail (filter != NULL);
-  tp_base_client_take_observer_filter (self,
-      _tp_base_client_copy_filter (filter));
-}
-
-/**
+/*
  * tp_base_client_take_observer_filter: (skip)
  * @self: a client
  * @filter: (transfer full) (element-type utf8 GObject.Value):
@@ -375,7 +338,7 @@ tp_base_client_add_observer_filter (TpBaseClient *self,
  *
  * Since: 0.11.5
  */
-void
+static void
 tp_base_client_take_observer_filter (TpBaseClient *self,
     GHashTable *filter)
 {
@@ -512,32 +475,7 @@ tp_base_client_set_observer_delay_approvers (TpBaseClient *self,
     }
 }
 
-/**
- * tp_base_client_add_approver_filter:
- * @self: a #TpBaseClient
- * @filter: (transfer none) (element-type utf8 GObject.Value):
- * a %TP_HASH_TYPE_CHANNEL_CLASS
- *
- * Register a new channel class as Approver.ApproverChannelFilter.
- * The #TpBaseClientClass.add_dispatch_operation virtual method will be called
- * whenever a new channel's properties match the ones in @filter.
- *
- * This method may only be called before tp_base_client_register() is
- * called, and may only be called on objects whose class implements
- * #TpBaseClientClass.add_dispatch_operation.
- *
- * Since: 0.11.5
- */
-void
-tp_base_client_add_approver_filter (TpBaseClient *self,
-    GHashTable *filter)
-{
-  g_return_if_fail (filter != NULL);
-  tp_base_client_take_approver_filter (self,
-      _tp_base_client_copy_filter (filter));
-}
-
-/**
+/*
  * tp_base_client_take_approver_filter: (skip)
  * @self: a client
  * @filter: (transfer full) (element-type utf8 GObject.Value):
@@ -558,7 +496,7 @@ tp_base_client_add_approver_filter (TpBaseClient *self,
  *
  * Since: 0.11.5
  */
-void
+static void
 tp_base_client_take_approver_filter (TpBaseClient *self,
     GHashTable *filter)
 {
@@ -628,33 +566,7 @@ tp_base_client_be_a_handler (TpBaseClient *self)
   self->priv->flags |= CLIENT_IS_HANDLER;
 }
 
-/**
- * tp_base_client_add_handler_filter:
- * @self: a #TpBaseClient
- * @filter: (transfer none) (element-type utf8 GObject.Value):
- * a %TP_HASH_TYPE_CHANNEL_CLASS
- *
- * Register a new channel class as Handler.HandlerChannelFilter.
- * The #TpBaseClientClass.handle_channel virtual method will be called
- * whenever a new channel's properties match the ones in @filter.
- *
- * This method may only be called before tp_base_client_register() is
- * called, and may only be called on objects whose class implements
- * #TpBaseClientClass.handle_channel.
- *
- * Since: 0.11.6
- */
-void
-tp_base_client_add_handler_filter (TpBaseClient *self,
-    GHashTable *filter)
-{
-  g_return_if_fail (filter != NULL);
-
-  tp_base_client_take_handler_filter (self,
-      _tp_base_client_copy_filter (filter));
-}
-
-/**
+/*
  * tp_base_client_take_handler_filter: (skip)
  * @self: a #TpBaseClient
  * @filter: (transfer full) (element-type utf8 GObject.Value):
@@ -675,7 +587,7 @@ tp_base_client_add_handler_filter (TpBaseClient *self,
  *
  * Since: 0.11.6
  */
-void
+static void
 tp_base_client_take_handler_filter (TpBaseClient *self,
     GHashTable *filter)
 {
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index 03f6ed4..b70c977 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -108,33 +108,21 @@ void tp_base_client_implement_handle_channel (TpBaseClientClass *klass,
 
 /* setup functions which can only be called before register() */
 
-void tp_base_client_add_observer_filter (TpBaseClient *self,
-    GHashTable *filter);
 _TP_AVAILABLE_IN_0_20
 void tp_base_client_add_observer_filter_vardict (TpBaseClient *self,
     GVariant *filter);
-void tp_base_client_take_observer_filter (TpBaseClient *self,
-    GHashTable *filter);
 
 void tp_base_client_set_observer_recover (TpBaseClient *self,
     gboolean recover);
 void tp_base_client_set_observer_delay_approvers (TpBaseClient *self,
     gboolean delay);
 
-void tp_base_client_add_approver_filter (TpBaseClient *self,
-    GHashTable *filter);
-void tp_base_client_take_approver_filter (TpBaseClient *self,
-    GHashTable *filter);
 _TP_AVAILABLE_IN_0_20
 void tp_base_client_add_approver_filter_vardict (TpBaseClient *self,
     GVariant *filter);
 
 void tp_base_client_be_a_handler (TpBaseClient *self);
 
-void tp_base_client_add_handler_filter (TpBaseClient *self,
-    GHashTable *filter);
-void tp_base_client_take_handler_filter (TpBaseClient *self,
-    GHashTable *filter);
 _TP_AVAILABLE_IN_0_20
 void tp_base_client_add_handler_filter_vardict (TpBaseClient *self,
     GVariant *filter);