telepathy-glib: Do not use TpTextMixin for channel types that does not need it

Xavier Claessens xclaesse at kemper.freedesktop.org
Mon Apr 30 09:09:40 PDT 2012


Module: telepathy-glib
Branch: master
Commit: 609825c7d81f98ab0f7c6463c9ce4c78c077e2fe
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=609825c7d81f98ab0f7c6463c9ce4c78c077e2fe

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Apr 30 18:01:18 2012 +0200

Do not use TpTextMixin for channel types that does not need it

This smell like contagious copy/pasting

---

 tests/lib/dbus-tube-chan.c     |    3 ---
 tests/lib/dbus-tube-chan.h     |    3 ---
 tests/lib/file-transfer-chan.c |    3 ---
 tests/lib/file-transfer-chan.h |    3 ---
 tests/lib/stream-tube-chan.c   |    3 ---
 tests/lib/stream-tube-chan.h   |    3 ---
 6 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c
index 835fe63..d3e04ee 100644
--- a/tests/lib/dbus-tube-chan.c
+++ b/tests/lib/dbus-tube-chan.c
@@ -245,9 +245,6 @@ tp_tests_dbus_tube_channel_class_init (TpTestsDBusTubeChannelClass *klass)
 
   /* base_class->target_handle_type is defined in subclasses */
 
-  tp_text_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpTestsDBusTubeChannelClass, text_class));
-
   param_spec = g_param_spec_string ("service-name", "Service Name",
       "the service name associated with this tube object.",
        "",
diff --git a/tests/lib/dbus-tube-chan.h b/tests/lib/dbus-tube-chan.h
index 30d496c..0a6b1a7 100644
--- a/tests/lib/dbus-tube-chan.h
+++ b/tests/lib/dbus-tube-chan.h
@@ -14,7 +14,6 @@
 #include <glib-object.h>
 #include <telepathy-glib/base-channel.h>
 #include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/text-mixin.h>
 
 G_BEGIN_DECLS
 
@@ -43,13 +42,11 @@ GType tp_tests_dbus_tube_channel_get_type (void);
 
 struct _TpTestsDBusTubeChannelClass {
     TpBaseChannelClass parent_class;
-    TpTextMixinClass text_class;
     TpDBusPropertiesMixinClass dbus_properties_class;
 };
 
 struct _TpTestsDBusTubeChannel {
     TpBaseChannel parent;
-    TpTextMixin text;
 
     TpTestsDBusTubeChannelPrivate *priv;
 };
diff --git a/tests/lib/file-transfer-chan.c b/tests/lib/file-transfer-chan.c
index e75e291..aff2dab 100644
--- a/tests/lib/file-transfer-chan.c
+++ b/tests/lib/file-transfer-chan.c
@@ -604,9 +604,6 @@ tp_tests_file_transfer_channel_class_init (
   base_class->close = channel_close;
   base_class->fill_immutable_properties = fill_immutable_properties;
 
-  tp_text_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpTestsFileTransferChannelClass, text_class));
-
   param_spec = g_param_spec_boxed ("available-socket-types",
       "AvailableSocketTypes",
       "The AvailableSocketTypes property of this channel",
diff --git a/tests/lib/file-transfer-chan.h b/tests/lib/file-transfer-chan.h
index c76a974..d642647 100644
--- a/tests/lib/file-transfer-chan.h
+++ b/tests/lib/file-transfer-chan.h
@@ -15,7 +15,6 @@
 #include <glib-object.h>
 #include <telepathy-glib/base-channel.h>
 #include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/text-mixin.h>
 
 G_BEGIN_DECLS
 
@@ -43,13 +42,11 @@ GType tp_tests_file_transfer_channel_get_type (void);
 
 struct _TpTestsFileTransferChannelClass {
     TpBaseChannelClass parent_class;
-    TpTextMixinClass text_class;
     TpDBusPropertiesMixinClass dbus_properties_class;
 };
 
 struct _TpTestsFileTransferChannel {
     TpBaseChannel parent;
-    TpTextMixin text;
 
     TpTestsFileTransferChannelPrivate *priv;
 };
diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
index 1638ccf..a965eae 100644
--- a/tests/lib/stream-tube-chan.c
+++ b/tests/lib/stream-tube-chan.c
@@ -275,9 +275,6 @@ tp_tests_stream_tube_channel_class_init (TpTestsStreamTubeChannelClass *klass)
 
   /* base_class->target_handle_type is defined in subclasses */
 
-  tp_text_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpTestsStreamTubeChannelClass, text_class));
-
   param_spec = g_param_spec_string ("service", "service name",
       "the service associated with this tube object.",
        "",
diff --git a/tests/lib/stream-tube-chan.h b/tests/lib/stream-tube-chan.h
index cb621b9..b0c8fbd 100644
--- a/tests/lib/stream-tube-chan.h
+++ b/tests/lib/stream-tube-chan.h
@@ -14,7 +14,6 @@
 #include <glib-object.h>
 #include <telepathy-glib/base-channel.h>
 #include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/text-mixin.h>
 
 G_BEGIN_DECLS
 
@@ -43,13 +42,11 @@ GType tp_tests_stream_tube_channel_get_type (void);
 
 struct _TpTestsStreamTubeChannelClass {
     TpBaseChannelClass parent_class;
-    TpTextMixinClass text_class;
     TpDBusPropertiesMixinClass dbus_properties_class;
 };
 
 struct _TpTestsStreamTubeChannel {
     TpBaseChannel parent;
-    TpTextMixin text;
 
     TpTestsStreamTubeChannelPrivate *priv;
 };



More information about the telepathy-commits mailing list