Stop implementing TpSvcDBusProperties interface

GDBusConnection and TpSvcInterfaceSkeleton does it for us already.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77144
Reviewed-by: Simon McVittie

24 files changed, 7 insertions, 129 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 754a5af38..38956d8dd 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -1965,7 +1965,6 @@ TpDBusPropertiesMixinSetter
 tp_dbus_properties_mixin_setter_gobject_properties
 tp_dbus_properties_mixin_class_init
 tp_dbus_properties_mixin_implement_interface
-tp_dbus_properties_mixin_iface_init
 tp_dbus_properties_mixin_get
 tp_dbus_properties_mixin_dup_all
 tp_dbus_properties_mixin_set
diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c
index b1a717927..60e64f01a 100644
--- a/examples/cm/contactlist/conn.c
+++ b/examples/cm/contactlist/conn.c
@@ -26,8 +26,6 @@ static void init_aliasing (gpointer, gpointer);
 G_DEFINE_TYPE_WITH_CODE (ExampleContactListConnection,
     example_contact_list_connection,
     TP_TYPE_BASE_CONNECTION,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-       tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
       init_aliasing);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
diff --git a/telepathy-glib/base-call-content.c b/telepathy-glib/base-call-content.c
index 0f48fcbb8..c73a7f8c3 100644
--- a/telepathy-glib/base-call-content.c
+++ b/telepathy-glib/base-call-content.c
@@ -148,9 +148,6 @@ static void call_content_dtmf_iface_init (gpointer g_iface,
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallContent, tp_base_call_content,
     G_TYPE_OBJECT,
-
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT,
         call_content_iface_init)
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_DTMF1,
diff --git a/telepathy-glib/base-call-stream.c b/telepathy-glib/base-call-stream.c
index dcb2c40ff..25e187327 100644
--- a/telepathy-glib/base-call-stream.c
+++ b/telepathy-glib/base-call-stream.c
@@ -116,9 +116,6 @@ static void call_stream_iface_init (gpointer g_iface, gpointer iface_data);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallStream, tp_base_call_stream,
     G_TYPE_OBJECT,
-
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_STREAM, call_stream_iface_init)
     )
 
diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel.c
index 0e0d26c96..8d7bd90a2 100644
--- a/telepathy-glib/base-channel.c
+++ b/telepathy-glib/base-channel.c
@@ -356,8 +356,6 @@ static void channel_iface_init (gpointer g_iface, gpointer iface_data);
 
 G_DEFINE_TYPE_WITH_CODE (TpBaseChannel, tp_base_channel,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index b3b4d3a88..ded33b03a 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -206,8 +206,6 @@ static void handler_iface_init (gpointer, gpointer);
 static void requests_iface_init (gpointer, gpointer);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseClient, tp_base_client, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CLIENT, NULL);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CLIENT_OBSERVER, observer_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CLIENT_APPROVER, approver_iface_init);
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index 346b37e7f..c310dc5f5 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -164,8 +164,6 @@ static void service_iface_init (gpointer, gpointer);
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnectionManager,
     tp_base_connection_manager,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_MANAGER,
         service_iface_init))
 
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 6ba632ae9..cb570abd2 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -267,8 +267,6 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnection,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION,
       conn_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS,
       requests_iface_init))
 
diff --git a/telepathy-glib/base-protocol.c b/telepathy-glib/base-protocol.c
index 619402b8f..708eb9cf0 100644
--- a/telepathy-glib/base-protocol.c
+++ b/telepathy-glib/base-protocol.c
@@ -582,8 +582,6 @@ static void addressing_iface_init (TpSvcProtocolInterfaceAddressing1Class *cls);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseProtocol, tp_base_protocol,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL, protocol_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE1,
       presence_iface_init);
diff --git a/telepathy-glib/call-content-media-description.c b/telepathy-glib/call-content-media-description.c
index ee33da6d6..8ead34a55 100644
--- a/telepathy-glib/call-content-media-description.c
+++ b/telepathy-glib/call-content-media-description.c
@@ -76,8 +76,6 @@ G_DEFINE_TYPE_WITH_CODE(TpCallContentMediaDescription,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION,
         call_content_media_description_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1,
         call_content_media_description_extra_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1,
diff --git a/telepathy-glib/call-stream-endpoint.c b/telepathy-glib/call-stream-endpoint.c
index fe4a48f2d..b896c47d7 100644
--- a/telepathy-glib/call-stream-endpoint.c
+++ b/telepathy-glib/call-stream-endpoint.c
@@ -76,8 +76,6 @@ G_DEFINE_TYPE_WITH_CODE(TpCallStreamEndpoint,
   G_TYPE_OBJECT,
   G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_STREAM_ENDPOINT,
       call_stream_endpoint_iface_init);
-   G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
 );
 
 /* properties */
diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c
index c89dcf64d..7130c9726 100644
--- a/telepathy-glib/dbus-properties-mixin.c
+++ b/telepathy-glib/dbus-properties-mixin.c
@@ -1049,29 +1049,6 @@ tp_dbus_properties_mixin_emit_properties_changed_varargs (
   g_ptr_array_unref (property_names);
 }
 
-static void
-_tp_dbus_properties_mixin_get (TpSvcDBusProperties *iface,
-                               const gchar *interface_name,
-                               const gchar *property_name,
-                               GDBusMethodInvocation *context)
-{
-  GObject *self = G_OBJECT (iface);
-  GValue value = { 0 };
-  GError *error = NULL;
-
-  if (tp_dbus_properties_mixin_get (self, interface_name, property_name,
-        &value, &error))
-    {
-      tp_svc_dbus_properties_return_from_get (context, &value);
-      g_value_unset (&value);
-    }
-  else
-    {
-      g_dbus_method_invocation_return_gerror (context, error);
-      g_error_free (error);
-    }
-}
-
 /**
  * tp_dbus_properties_mixin_dup_all:
  * @self: an object with this mixin
@@ -1123,18 +1100,6 @@ tp_dbus_properties_mixin_dup_all (GObject *self,
   return values;
 }
 
-static void
-_tp_dbus_properties_mixin_get_all_dbus (TpSvcDBusProperties *iface,
-    const gchar *interface_name,
-    GDBusMethodInvocation *context)
-{
-  GHashTable *values = tp_dbus_properties_mixin_dup_all (G_OBJECT (iface),
-      interface_name);
-
-  tp_svc_dbus_properties_return_from_get_all (context, values);
-  g_hash_table_unref (values);
-}
-
 /**
  * tp_dbus_properties_mixin_set:
  * @self: an object with this mixin
@@ -1238,48 +1203,3 @@ out:
 
   return ret;
 }
-
-static void
-_tp_dbus_properties_mixin_set (TpSvcDBusProperties *iface,
-                               const gchar *interface_name,
-                               const gchar *property_name,
-                               const GValue *value,
-                               GDBusMethodInvocation *context)
-{
-  GObject *self = G_OBJECT (iface);
-  GError *error = NULL;
-
-  if (tp_dbus_properties_mixin_set (self, interface_name, property_name, value,
-          &error))
-    {
-      tp_svc_dbus_properties_return_from_set (context);
-    }
-  else
-    {
-      g_dbus_method_invocation_return_gerror (context, error);
-      g_error_free (error);
-    }
-}
-
-/**
- * tp_dbus_properties_mixin_iface_init:
- * @g_iface: a pointer to a #TpSvcDBusPropertiesClass structure
- * @iface_data: ignored
- *
- * Declare that the DBus.Properties interface represented by @g_iface
- * is implemented using this mixin.
- */
-void
-tp_dbus_properties_mixin_iface_init (gpointer g_iface,
-                                     gpointer iface_data)
-{
-  TpSvcDBusPropertiesClass *cls = g_iface;
-
-#define IMPLEMENT(x, suffix) \
-    tp_svc_dbus_properties_implement_##x (cls, \
-        _tp_dbus_properties_mixin_##x##suffix)
-  IMPLEMENT (get,);
-  IMPLEMENT (get_all,_dbus);
-  IMPLEMENT (set,);
-#undef IMPLEMENT
-}
diff --git a/telepathy-glib/dbus-properties-mixin.h b/telepathy-glib/dbus-properties-mixin.h
index 7a831c808..5811008a5 100644
--- a/telepathy-glib/dbus-properties-mixin.h
+++ b/telepathy-glib/dbus-properties-mixin.h
@@ -118,9 +118,6 @@ void tp_dbus_properties_mixin_implement_interface (GObjectClass *cls,
     GQuark iface, TpDBusPropertiesMixinGetter getter,
     TpDBusPropertiesMixinSetter setter, TpDBusPropertiesMixinPropImpl *props);
 
-void tp_dbus_properties_mixin_iface_init (gpointer g_iface,
-    gpointer iface_data);
-
 gboolean tp_dbus_properties_mixin_get (GObject *self,
     const gchar *interface_name, const gchar *property_name,
     GValue *value, GError **error);
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 937944adc..5203fddc8 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -840,7 +840,10 @@ tp_dbus_connection_try_register_object (GDBusConnection *dbus_connection,
       /* We don't want to export Properties interface, TpSvcInterfaceSkeleton
        * will handle that itself. */
       if (iface == TP_TYPE_SVC_DBUS_PROPERTIES)
-        continue;
+        {
+          WARNING ("TpSvcDBusProperties interface shouldn't be implemented");
+          continue;
+        }
 
       skeleton = _tp_svc_interface_skeleton_new (object, iface, iinfo);
 
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index ddc6a9407..c5b190a66 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -94,8 +94,6 @@ typedef struct {
 } DebugMessage;
 
 G_DEFINE_TYPE_WITH_CODE (TpDebugSender, tp_debug_sender, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DEBUG1, debug_iface_init))
 
 /* properties */
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index d34f74124..b8ff454e7 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -776,7 +776,6 @@ tp_dbus_properties_mixin_fill_properties_hash
 tp_dbus_properties_mixin_flags_get_type
 tp_dbus_properties_mixin_get
 tp_dbus_properties_mixin_getter_gobject_properties
-tp_dbus_properties_mixin_iface_init
 tp_dbus_properties_mixin_implement_interface
 tp_dbus_properties_mixin_make_properties_hash
 tp_dbus_properties_mixin_set
diff --git a/tests/dbus/properties.c b/tests/dbus/properties.c
index 9558caac6..bd09b5c2f 100644
--- a/tests/dbus/properties.c
+++ b/tests/dbus/properties.c
@@ -50,9 +50,7 @@ GType test_properties_get_type (void);
 G_DEFINE_TYPE_WITH_CODE (TestProperties,
     test_properties,
     G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TEST_TYPE_SVC_WITH_PROPERTIES, NULL);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init));
+    G_IMPLEMENT_INTERFACE (TEST_TYPE_SVC_WITH_PROPERTIES, NULL))
 
 static void
 test_properties_init (TestProperties *self)
diff --git a/tests/lib/simple-account-manager.c b/tests/lib/simple-account-manager.c
index 767bce449..7b01e06c1 100644
--- a/tests/lib/simple-account-manager.c
+++ b/tests/lib/simple-account-manager.c
@@ -23,8 +23,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccountManager,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_MANAGER,
         account_manager_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     )
 
 
diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
index 30ac4444f..c56cec6c0 100644
--- a/tests/lib/simple-account.c
+++ b/tests/lib/simple-account.c
@@ -30,8 +30,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount,
         NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE1,
         NULL);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     )
 
 /* TP_IFACE_ACCOUNT is implied */
diff --git a/tests/lib/simple-channel-dispatch-operation.c b/tests/lib/simple-channel-dispatch-operation.c
index 8786b9370..b09a48d8b 100644
--- a/tests/lib/simple-channel-dispatch-operation.c
+++ b/tests/lib/simple-channel-dispatch-operation.c
@@ -24,8 +24,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleChannelDispatchOperation,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION,
         channel_dispatch_operation_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     )
 
 /* TP_IFACE_CHANNEL_DISPATCH_OPERATION is implied */
diff --git a/tests/lib/simple-channel-dispatcher.c b/tests/lib/simple-channel-dispatcher.c
index afe62cb86..086b7942c 100644
--- a/tests/lib/simple-channel-dispatcher.c
+++ b/tests/lib/simple-channel-dispatcher.c
@@ -25,8 +25,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleChannelDispatcher,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_DISPATCHER,
         channel_dispatcher_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     )
 
 /* signals */
diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c
index e3d225bac..193ad2fe4 100644
--- a/tests/lib/simple-channel-request.c
+++ b/tests/lib/simple-channel-request.c
@@ -25,8 +25,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleChannelRequest,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_REQUEST,
         channel_request_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init)
     )
 
 
diff --git a/tests/lib/textchan-group.c b/tests/lib/textchan-group.c
index 068ba463e..02ed2896d 100644
--- a/tests/lib/textchan-group.c
+++ b/tests/lib/textchan-group.c
@@ -27,9 +27,7 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsTextChannelGroup,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
       tp_group_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD1,
-      password_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init))
+      password_iface_init);)
 
 static GPtrArray *
 text_channel_group_get_interfaces (TpBaseChannel *self)
diff --git a/tests/lib/tls-certificate.c b/tests/lib/tls-certificate.c
index d4b4344f1..48ceccc18 100644
--- a/tests/lib/tls-certificate.c
+++ b/tests/lib/tls-certificate.c
@@ -34,9 +34,7 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsTLSCertificate,
     tp_tests_tls_certificate,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE,
-        tls_certificate_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init);)
+        tls_certificate_iface_init);)
 
 struct _TpTestsTLSCertificatePrivate {
   gchar *object_path;