base-client: remove _object suffix from higher level filter API

13 files changed, 59 insertions, 59 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 3ac119e46..28d742c94 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4532,23 +4532,23 @@ TpDebugSenderPrivate
 TpBaseClient
 TpBaseClientClass
 tp_base_client_add_observer_filter_variant
-tp_base_client_add_observer_filter_object
-tp_base_client_take_observer_filter_object
+tp_base_client_add_observer_filter
+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_variant
-tp_base_client_add_approver_filter_object
-tp_base_client_take_approver_filter_object
+tp_base_client_add_approver_filter
+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_variant
-tp_base_client_add_handler_filter_object
-tp_base_client_take_handler_filter_object
+tp_base_client_add_handler_filter
+tp_base_client_take_handler_filter
 tp_base_client_be_a_handler
 TpBaseClientClassHandleChannelImpl
 tp_base_client_implement_handle_channel
diff --git a/examples/client/approver.c b/examples/client/approver.c
index e1f0b572a..c6b7a36ac 100644
--- a/examples/client/approver.c
+++ b/examples/client/approver.c
@@ -142,19 +142,19 @@ main (int argc,
       FALSE, add_dispatch_operation_cb, NULL, NULL);
 
   /* contact text chat */
-  tp_base_client_take_approver_filter_object (approver,
+  tp_base_client_take_approver_filter (approver,
       tp_channel_filter_new_for_text_chats ());
 
   /* call */
-  tp_base_client_take_approver_filter_object (approver,
+  tp_base_client_take_approver_filter (approver,
       tp_channel_filter_new_for_calls (TP_ENTITY_TYPE_CONTACT));
 
   /* room text chat */
-  tp_base_client_take_approver_filter_object (approver,
+  tp_base_client_take_approver_filter (approver,
       tp_channel_filter_new_for_text_chatrooms ());
 
   /* file transfer */
-  tp_base_client_take_approver_filter_object (approver,
+  tp_base_client_take_approver_filter (approver,
       tp_channel_filter_new_for_file_transfers (NULL));
 
   if (!tp_base_client_register (approver, &error))
diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index 264add37f..ecb9c7f95 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -173,7 +173,7 @@ main (int argc,
   filter = tp_channel_filter_new_for_dbus_tubes (EXAMPLE_SERVICE_NAME);
   tp_channel_filter_require_locally_requested (filter, FALSE);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_take_handler_filter_object (handler, filter);
+  tp_base_client_take_handler_filter (handler, filter);
 
   tp_base_client_register (handler, &error);
   g_assert_no_error (error);
diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c
index 55791a91e..0fe95e53f 100644
--- a/examples/client/media-observer.c
+++ b/examples/client/media-observer.c
@@ -72,7 +72,7 @@ main (int argc,
   observer = tp_simple_observer_new_with_am (manager, FALSE,
       "ExampleMediaObserver", FALSE, observe_channel_cb, NULL, NULL);
 
-  tp_base_client_take_observer_filter_object (observer,
+  tp_base_client_take_observer_filter (observer,
       tp_channel_filter_new_for_calls (TP_ENTITY_TYPE_CONTACT));
 
   if (!tp_base_client_register (observer, &error))
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index a747ee857..8bc188fdb 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -115,7 +115,7 @@ main (int argc,
   filter = tp_channel_filter_new_for_stream_tubes ("ExampleService");
   tp_channel_filter_require_locally_requested (filter, FALSE);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_take_handler_filter_object (handler, filter);
+  tp_base_client_take_handler_filter (handler, filter);
 
   tp_base_client_register (handler, &error);
   g_assert_no_error (error);
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index dd14cf895..5577ad91b 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -117,7 +117,7 @@ main (int argc,
    * contact */
   filter = tp_channel_filter_new_for_text_chats ();
   tp_channel_filter_require_locally_requested (filter, FALSE);
-  tp_base_client_take_handler_filter_object (handler, filter);
+  tp_base_client_take_handler_filter (handler, filter);
 
   if (!tp_base_client_register (handler, &error))
     {
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 16523bce9..403b693b6 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -319,7 +319,7 @@ tp_base_client_dup_account (TpBaseClient *self,
 }
 
 /**
- * tp_base_client_add_observer_filter_object:
+ * tp_base_client_add_observer_filter:
  * @self: a #TpBaseClient
  * @filter: a filter
  *
@@ -334,13 +334,13 @@ tp_base_client_dup_account (TpBaseClient *self,
  *
  * |[
  * filter = tp_channel_filter_new_for_text_chats ();
- * tp_base_client_add_observer_filter_object (client, filter);
+ * tp_base_client_add_observer_filter (client, filter);
  * g_object_unref (filter);
  *
  * filter = tp_channel_filter_new_for_file_transfer (NULL);
  * tp_channel_filter_require_target_is_contact (filter);
  * tp_channel_filter_require_requested (filter, FALSE);
- * tp_base_client_add_observer_filter_object (client, filter);
+ * tp_base_client_add_observer_filter (client, filter);
  * g_object_unref (filter);
  * ]|
  *
@@ -354,7 +354,7 @@ tp_base_client_dup_account (TpBaseClient *self,
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_add_observer_filter_object (TpBaseClient *self,
+tp_base_client_add_observer_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
   g_return_if_fail (TP_IS_CHANNEL_FILTER (filter));
@@ -362,26 +362,26 @@ tp_base_client_add_observer_filter_object (TpBaseClient *self,
 }
 
 /**
- * tp_base_client_take_observer_filter_object: (skip)
+ * tp_base_client_take_observer_filter: (skip)
  * @self: a #TpBaseClient
  * @filter: (transfer full): a filter
  *
- * The same as tp_base_client_add_observer_filter_object(), but also
+ * The same as tp_base_client_add_observer_filter(), but also
  * takes ownership of the filter. This makes it more convenient to call
  * in simple situations:
  *
  * |[
- * tp_base_client_take_observer_filter_object (client,
+ * tp_base_client_take_observer_filter (client,
  *     tp_channel_filter_new_for_text_chats ());
  * ]|
  *
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_take_observer_filter_object (TpBaseClient *self,
+tp_base_client_take_observer_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
-  tp_base_client_add_observer_filter_object (self, filter);
+  tp_base_client_add_observer_filter (self, filter);
   g_object_unref (filter);
 }
 
@@ -515,7 +515,7 @@ tp_base_client_set_observer_delay_approvers (TpBaseClient *self,
 }
 
 /**
- * tp_base_client_add_approver_filter_object:
+ * tp_base_client_add_approver_filter:
  * @self: a #TpBaseClient
  * @filter: a filter
  *
@@ -526,7 +526,7 @@ tp_base_client_set_observer_delay_approvers (TpBaseClient *self,
  *
  * This method can be called more than once. If it is, the client will
  * be an Approver for any channel that matches any of the filters.
- * See tp_base_client_add_observer_filter_object().
+ * See tp_base_client_add_observer_filter().
  *
  * This method may only be called before tp_base_client_register() is
  * called, and may only be called on objects whose class implements
@@ -535,7 +535,7 @@ tp_base_client_set_observer_delay_approvers (TpBaseClient *self,
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_add_approver_filter_object (TpBaseClient *self,
+tp_base_client_add_approver_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
   g_return_if_fail (TP_IS_CHANNEL_FILTER (filter));
@@ -543,26 +543,26 @@ tp_base_client_add_approver_filter_object (TpBaseClient *self,
 }
 
 /**
- * tp_base_client_take_approver_filter_object: (skip)
+ * tp_base_client_take_approver_filter: (skip)
  * @self: a #TpBaseClient
  * @filter: (transfer full): a filter
  *
- * The same as tp_base_client_add_approver_filter_object(), but also
+ * The same as tp_base_client_add_approver_filter(), but also
  * takes ownership of the filter. This makes it more convenient to call
  * in simple situations:
  *
  * |[
- * tp_base_client_take_approver_filter_object (client,
+ * tp_base_client_take_approver_filter (client,
  *     tp_channel_filter_new_for_text_chats ());
  * ]|
  *
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_take_approver_filter_object (TpBaseClient *self,
+tp_base_client_take_approver_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
-  tp_base_client_add_approver_filter_object (self, filter);
+  tp_base_client_add_approver_filter (self, filter);
   g_object_unref (filter);
 }
 
@@ -629,7 +629,7 @@ tp_base_client_be_a_handler (TpBaseClient *self)
 }
 
 /**
- * tp_base_client_add_handler_filter_object:
+ * tp_base_client_add_handler_filter:
  * @self: a #TpBaseClient
  * @filter: a filter
  *
@@ -640,7 +640,7 @@ tp_base_client_be_a_handler (TpBaseClient *self)
  *
  * This method can be called more than once. If it is, the client will
  * be a Handler for any channel that matches any of the filters.
- * See tp_base_client_add_observer_filter_object().
+ * See tp_base_client_add_observer_filter().
  *
  * This method may only be called before tp_base_client_register() is
  * called, and may only be called on objects whose class implements
@@ -649,7 +649,7 @@ tp_base_client_be_a_handler (TpBaseClient *self)
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_add_handler_filter_object (TpBaseClient *self,
+tp_base_client_add_handler_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
   g_return_if_fail (TP_IS_CHANNEL_FILTER (filter));
@@ -693,26 +693,26 @@ tp_base_client_add_handler_filter_variant (TpBaseClient *self,
 }
 
 /**
- * tp_base_client_take_handler_filter_object: (skip)
+ * tp_base_client_take_handler_filter: (skip)
  * @self: a #TpBaseClient
  * @filter: (transfer full): a filter
  *
- * The same as tp_base_client_add_handler_filter_object(), but also
+ * The same as tp_base_client_add_handler_filter(), but also
  * takes ownership of the filter. This makes it more convenient to call
  * in simple situations:
  *
  * |[
- * tp_base_client_take_handler_filter_object (client,
+ * tp_base_client_take_handler_filter (client,
  *     tp_channel_filter_new_for_text_chats ());
  * ]|
  *
  * Since: 0.UNRELEASED
  */
 void
-tp_base_client_take_handler_filter_object (TpBaseClient *self,
+tp_base_client_take_handler_filter (TpBaseClient *self,
     TpChannelFilter *filter)
 {
-  tp_base_client_add_handler_filter_object (self, filter);
+  tp_base_client_add_handler_filter (self, filter);
   g_object_unref (filter);
 }
 
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index 661f077f1..ba43a1b30 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -114,10 +114,10 @@ void tp_base_client_add_observer_filter_variant (TpBaseClient *self,
     GVariant *filter);
 
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_add_observer_filter_object (TpBaseClient *self,
+void tp_base_client_add_observer_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_take_observer_filter_object (TpBaseClient *self,
+void tp_base_client_take_observer_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 
 void tp_base_client_set_observer_recover (TpBaseClient *self,
@@ -130,10 +130,10 @@ void tp_base_client_add_approver_filter_variant (TpBaseClient *self,
     GVariant *filter);
 
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_add_approver_filter_object (TpBaseClient *self,
+void tp_base_client_add_approver_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_take_approver_filter_object (TpBaseClient *self,
+void tp_base_client_take_approver_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 
 void tp_base_client_be_a_handler (TpBaseClient *self);
@@ -143,10 +143,10 @@ void tp_base_client_add_handler_filter_variant (TpBaseClient *self,
     GVariant *filter);
 
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_add_handler_filter_object (TpBaseClient *self,
+void tp_base_client_add_handler_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 _TP_AVAILABLE_IN_UNRELEASED
-void tp_base_client_take_handler_filter_object (TpBaseClient *self,
+void tp_base_client_take_handler_filter (TpBaseClient *self,
     TpChannelFilter *filter);
 
 void tp_base_client_set_handler_bypass_approval (TpBaseClient *self,
diff --git a/telepathy-glib/channel-filter.c b/telepathy-glib/channel-filter.c
index 1dda061dc..093360675 100644
--- a/telepathy-glib/channel-filter.c
+++ b/telepathy-glib/channel-filter.c
@@ -70,9 +70,9 @@
  * required.
  *
  * Finally, add it to a #TpBaseClient using
- * tp_base_client_add_observer_filter_object(),
- * tp_base_client_add_approver_filter_object() and/or
- * tp_base_client_add_handler_filter_object() (depending on the type
+ * tp_base_client_add_observer_filter(),
+ * tp_base_client_add_approver_filter() and/or
+ * tp_base_client_add_handler_filter() (depending on the type
  * of client required), and release the filter object with g_object_unref().
  *
  * If you would like the #TpBaseClient to act on particular channels in
@@ -433,7 +433,7 @@ tp_channel_filter_new_for_dbus_tubes (const gchar *service)
  * |[
  * filter = tp_channel_filter_new_for_file_transfer ("com.example.MyApp");
  * tp_channel_filter_require_locally_requested (filter, FALSE);
- * tp_base_client_take_handler_filter_object (client, filter);
+ * tp_base_client_take_handler_filter (client, filter);
  * ]|
  */
 TpChannelFilter *
diff --git a/telepathy-glib/simple-approver.c b/telepathy-glib/simple-approver.c
index 2f820e047..431bb6b93 100644
--- a/telepathy-glib/simple-approver.c
+++ b/telepathy-glib/simple-approver.c
@@ -47,7 +47,7 @@
  * client = tp_simple_approver_new (NULL, "MyApprover", FALSE,
  *    my_add_dispatch_operation, user_data);
  *
- * tp_base_client_take_approver_filter_object (client,
+ * tp_base_client_take_approver_filter (client,
  *      tp_channel_filter_new_for_text_chats ());
  *
  * tp_base_client_register (client, NULL);
diff --git a/telepathy-glib/simple-handler.c b/telepathy-glib/simple-handler.c
index 7484a729f..f3871a1ff 100644
--- a/telepathy-glib/simple-handler.c
+++ b/telepathy-glib/simple-handler.c
@@ -48,7 +48,7 @@
  * client = tp_simple_handler_new (NULL, FALSE, FALSE,
  *     "MyHandler", FALSE, my_handle_channel, user_data);
  *
- * tp_base_client_take_handler_filter_object (client,
+ * tp_base_client_take_handler_filter (client,
  *      tp_channel_filter_new_for_text_chats ());
  *
  * tp_base_client_register (client, NULL);
diff --git a/telepathy-glib/simple-observer.c b/telepathy-glib/simple-observer.c
index 99233971e..fca5fafb4 100644
--- a/telepathy-glib/simple-observer.c
+++ b/telepathy-glib/simple-observer.c
@@ -47,7 +47,7 @@
  * client = tp_simple_observer_new (NULL, TRUE, "MyObserver",
  *     FALSE, my_observe_channel, user_data);
  *
- * tp_base_client_take_observer_filter_object (client,
+ * tp_base_client_take_observer_filter (client,
  *      tp_channel_filter_new_for_text_chats ());
  *
  * tp_base_client_register (client, NULL);
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index 5643d3af7..fed7a049d 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -474,12 +474,12 @@ test_observer (Test *test,
 
   filter = tp_channel_filter_new ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
-  tp_base_client_add_observer_filter_object (test->base_client, filter);
+  tp_base_client_add_observer_filter (test->base_client, filter);
   g_object_unref (filter);
 
   filter = tp_channel_filter_new_for_stream_tubes (NULL);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_add_observer_filter_object (test->base_client, filter);
+  tp_base_client_add_observer_filter (test->base_client, filter);
   g_object_unref (filter);
 
   tp_base_client_set_observer_recover (test->base_client, TRUE);
@@ -614,12 +614,12 @@ test_approver (Test *test,
 
   filter = tp_channel_filter_new ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
-  tp_base_client_add_approver_filter_object (test->base_client, filter);
+  tp_base_client_add_approver_filter (test->base_client, filter);
   g_object_unref (filter);
 
   filter = tp_channel_filter_new_for_stream_tubes (NULL);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_add_approver_filter_object (test->base_client, filter);
+  tp_base_client_add_approver_filter (test->base_client, filter);
   g_object_unref (filter);
 
   tp_base_client_register (test->base_client, &test->error);
@@ -798,12 +798,12 @@ test_handler (Test *test,
 
   filter = tp_channel_filter_new ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
-  tp_base_client_add_handler_filter_object (test->base_client, filter);
+  tp_base_client_add_handler_filter (test->base_client, filter);
   g_object_unref (filter);
 
   filter = tp_channel_filter_new_for_stream_tubes (NULL);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_add_handler_filter_object (test->base_client, filter);
+  tp_base_client_add_handler_filter (test->base_client, filter);
   g_object_unref (filter);
 
   tp_base_client_set_handler_bypass_approval (test->base_client, TRUE);
@@ -954,7 +954,7 @@ test_handler_requests (Test *test,
 
   filter = tp_channel_filter_new_for_stream_tubes (NULL);
   tp_channel_filter_require_target_is_contact (filter);
-  tp_base_client_add_handler_filter_object (test->base_client, filter);
+  tp_base_client_add_handler_filter (test->base_client, filter);
   g_object_unref (filter);
 
   tp_base_client_set_handler_request_notification (test->base_client);