rename tp_channel_filter_new_for_all_types()

5 files changed, 23 insertions, 26 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 28d742c94..7aaa224fc 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -6197,7 +6197,7 @@ TpRoomInfoPriv
 <TITLE>channel-filter</TITLE>
 <INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpChannelFilter
-tp_channel_filter_new
+tp_channel_filter_new_for_all_types
 tp_channel_filter_new_for_calls
 tp_channel_filter_new_for_dbus_tubes
 tp_channel_filter_new_for_file_transfers
diff --git a/telepathy-glib/channel-filter.c b/telepathy-glib/channel-filter.c
index 093360675..87ecb4ea0 100644
--- a/telepathy-glib/channel-filter.c
+++ b/telepathy-glib/channel-filter.c
@@ -147,17 +147,14 @@ tp_channel_filter_class_init (TpChannelFilterClass *cls)
 }
 
 /**
- * tp_channel_filter_new:
+ * tp_channel_filter_new_for_all_types:
  *
  * Return a channel filter that matches every channel.
  *
- * You can make the filter more restrictive by setting properties. In
- * practice, to make a filter useful, you should set at least a channel
- * type (text, call, file transfer etc.) and a target type
- * (contact, chatroom, etc.).
+ * You can make the filter more restrictive by setting properties.
  */
 TpChannelFilter *
-tp_channel_filter_new (void)
+tp_channel_filter_new_for_all_types (void)
 {
   return g_object_new (TP_TYPE_CHANNEL_FILTER,
       NULL);
@@ -175,7 +172,7 @@ tp_channel_filter_new (void)
 TpChannelFilter *
 tp_channel_filter_new_for_text_chats (void)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_target_is_contact (self);
   tp_channel_filter_require_channel_type (self, TP_IFACE_CHANNEL_TYPE_TEXT);
@@ -195,7 +192,7 @@ tp_channel_filter_new_for_text_chats (void)
 TpChannelFilter *
 tp_channel_filter_new_for_text_chatrooms (void)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_target_is_room (self);
   tp_channel_filter_require_channel_type (self, TP_IFACE_CHANNEL_TYPE_TEXT);
@@ -307,7 +304,7 @@ tp_channel_filter_require_target_type (TpChannelFilter *self,
 TpChannelFilter *
 tp_channel_filter_new_for_calls (TpEntityType entity_type)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_target_type (self, entity_type);
   tp_channel_filter_require_channel_type (self, TP_IFACE_CHANNEL_TYPE_CALL1);
@@ -357,7 +354,7 @@ tp_channel_filter_require_channel_type (TpChannelFilter *self,
 TpChannelFilter *
 tp_channel_filter_new_for_stream_tubes (const gchar *service)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_channel_type (self,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
@@ -390,7 +387,7 @@ tp_channel_filter_new_for_stream_tubes (const gchar *service)
 TpChannelFilter *
 tp_channel_filter_new_for_dbus_tubes (const gchar *service)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_channel_type (self,
       TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1);
@@ -439,7 +436,7 @@ tp_channel_filter_new_for_dbus_tubes (const gchar *service)
 TpChannelFilter *
 tp_channel_filter_new_for_file_transfers (const gchar *service)
 {
-  TpChannelFilter *self = tp_channel_filter_new ();
+  TpChannelFilter *self = tp_channel_filter_new_for_all_types ();
 
   tp_channel_filter_require_target_is_contact (self);
   tp_channel_filter_require_channel_type (self,
diff --git a/telepathy-glib/channel-filter.h b/telepathy-glib/channel-filter.h
index ba7b4b6a4..deed593ae 100644
--- a/telepathy-glib/channel-filter.h
+++ b/telepathy-glib/channel-filter.h
@@ -53,7 +53,7 @@ GType tp_channel_filter_get_type (void);
                               TpChannelFilterClass))
 
 _TP_AVAILABLE_IN_UNRELEASED G_GNUC_WARN_UNUSED_RESULT
-TpChannelFilter *tp_channel_filter_new (void);
+TpChannelFilter *tp_channel_filter_new_for_all_types (void);
 
 _TP_AVAILABLE_IN_UNRELEASED G_GNUC_WARN_UNUSED_RESULT
 TpChannelFilter *tp_channel_filter_new_for_text_chats (void);
diff --git a/tests/channel-filter.c b/tests/channel-filter.c
index f645ffc9a..af7dd5f49 100644
--- a/tests/channel-filter.c
+++ b/tests/channel-filter.c
@@ -28,7 +28,7 @@ test_basics (Fixture *f,
       TP_ENTITY_TYPE_NONE };
       */
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   vardict = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (g_variant_n_children (vardict), ==, 0);
   g_variant_unref (vardict);
@@ -115,7 +115,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_target_is_contact (f->filter);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -125,7 +125,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_target_is_room (f->filter);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -135,7 +135,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_no_target (f->filter);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -145,7 +145,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_target_type (f->filter, TP_ENTITY_TYPE_ROOM);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -155,7 +155,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_channel_type (f->filter, "com.example.Bees");
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -163,7 +163,7 @@ test_basics (Fixture *f,
         TP_PROP_CHANNEL_CHANNEL_TYPE), ==, "com.example.Bees");
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_locally_requested (f->filter, TRUE);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -172,7 +172,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_locally_requested (f->filter, FALSE);
   asv = _tp_channel_filter_use (f->filter);
   g_assert_cmpuint (tp_asv_size (asv), ==, 1);
@@ -181,7 +181,7 @@ test_basics (Fixture *f,
   g_assert (valid);
   g_clear_object (&f->filter);
 
-  f->filter = tp_channel_filter_new ();
+  f->filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_property (f->filter,
       "com.example.Answer", g_variant_new_uint32 (42));
   asv = _tp_channel_filter_use (f->filter);
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index fed7a049d..ede98ff60 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -472,7 +472,7 @@ test_observer (Test *test,
   TpChannel *chan;
   GHashTable *chan_props, *requests_satisfied;
 
-  filter = tp_channel_filter_new ();
+  filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
   tp_base_client_add_observer_filter (test->base_client, filter);
   g_object_unref (filter);
@@ -612,7 +612,7 @@ test_approver (Test *test,
   GHashTable *chan_props;
   TpChannel *chan;
 
-  filter = tp_channel_filter_new ();
+  filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
   tp_base_client_add_approver_filter (test->base_client, filter);
   g_object_unref (filter);
@@ -796,7 +796,7 @@ test_handler (Test *test,
   GList *chans;
   TpTestsSimpleClient *client_2;
 
-  filter = tp_channel_filter_new ();
+  filter = tp_channel_filter_new_for_all_types ();
   tp_channel_filter_require_channel_type (filter, TP_IFACE_CHANNEL_TYPE_TEXT);
   tp_base_client_add_handler_filter (test->base_client, filter);
   g_object_unref (filter);