[Telepathy-commits] [telepathy-salut/master] Channels do not implement .FUTURE anymore. Remove include extensions/extensions.h.

[Alban Crequy]

---
 src/salut-contact-channel.c |    4 ----
 src/salut-im-channel.c      |    4 ----
 src/salut-muc-channel.c     |    4 ----
 src/salut-tubes-channel.c   |    4 ----
 src/tube-stream.c           |    1 -
 5 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/salut-contact-channel.c b/src/salut-contact-channel.c
index f4ad1ed..e89683c 100644
--- a/src/salut-contact-channel.c
+++ b/src/salut-contact-channel.c
@@ -30,8 +30,6 @@
 #include <telepathy-glib/svc-generic.h>
 #include <telepathy-glib/util.h>
 
-#include "extensions/extensions.h"
-
 #include "salut-connection.h"
 
 static void
@@ -43,7 +41,6 @@ G_DEFINE_TYPE_WITH_CODE(SalutContactChannel, salut_contact_channel,
       tp_dbus_properties_mixin_iface_init);
   G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
   G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
-  G_IMPLEMENT_INTERFACE (SALUT_TYPE_SVC_CHANNEL_FUTURE, NULL);
   G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
   G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
       tp_group_mixin_iface_init);
@@ -52,7 +49,6 @@ G_DEFINE_TYPE_WITH_CODE(SalutContactChannel, salut_contact_channel,
 
 static const gchar *salut_contact_channel_interfaces[] = {
     TP_IFACE_CHANNEL_INTERFACE_GROUP,
-    SALUT_IFACE_CHANNEL_FUTURE,
     NULL
 };
 
diff --git a/src/salut-im-channel.c b/src/salut-im-channel.c
index 1939985..9c50af6 100644
--- a/src/salut-im-channel.c
+++ b/src/salut-im-channel.c
@@ -40,8 +40,6 @@
 #include <gibber/gibber-xmpp-connection.h>
 #include <gibber/gibber-xmpp-stanza.h>
 
-#include "extensions/extensions.h"
-
 #define DEBUG_FLAG DEBUG_IM
 #include "debug.h"
 #include "salut-connection.h"
@@ -63,14 +61,12 @@ G_DEFINE_TYPE_WITH_CODE (SalutImChannel, salut_im_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 (SALUT_TYPE_SVC_CHANNEL_FUTURE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT, text_iface_init);
 );
 
 static const gchar *salut_im_channel_interfaces[] = {
-    SALUT_IFACE_CHANNEL_FUTURE,
     NULL
 };
 
diff --git a/src/salut-muc-channel.c b/src/salut-muc-channel.c
index 58d5d3e..e60d00b 100644
--- a/src/salut-muc-channel.c
+++ b/src/salut-muc-channel.c
@@ -44,8 +44,6 @@
 
 #include <gibber/gibber-muc-connection.h>
 
-#include "extensions/extensions.h"
-
 #include "salut-connection.h"
 #include "salut-self.h"
 #include "salut-xmpp-connection-manager.h"
@@ -60,7 +58,6 @@ G_DEFINE_TYPE_WITH_CODE(SalutMucChannel, salut_muc_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 (SALUT_TYPE_SVC_CHANNEL_FUTURE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
     G_IMPLEMENT_INTERFACE(TP_TYPE_CHANNEL_IFACE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
@@ -70,7 +67,6 @@ G_DEFINE_TYPE_WITH_CODE(SalutMucChannel, salut_muc_channel, G_TYPE_OBJECT,
 
 static const char *salut_muc_channel_interfaces[] = {
   TP_IFACE_CHANNEL_INTERFACE_GROUP,
-  SALUT_IFACE_CHANNEL_FUTURE,
   NULL
 };
 
diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index bb3130a..a3923e0 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -40,8 +40,6 @@
 #include <gibber/gibber-namespaces.h>
 #include <gibber/gibber-xmpp-error.h>
 
-#include "extensions/extensions.h"
-
 #define DEBUG_FLAG DEBUG_TUBES
 #include "debug.h"
 #include "salut-util.h"
@@ -75,7 +73,6 @@ G_DEFINE_TYPE_WITH_CODE (SalutTubesChannel, salut_tubes_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 (SALUT_TYPE_SVC_CHANNEL_FUTURE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TUBES, tubes_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
@@ -89,7 +86,6 @@ static const char *salut_tubes_channel_interfaces[] = {
   /* If more interfaces are added, either keep Group as the first, or change
    * the implementations of salut_tubes_channel_get_interfaces () and
    * salut_tubes_channel_get_property () too */
-  SALUT_IFACE_CHANNEL_FUTURE,
   NULL
 };
 
diff --git a/src/tube-stream.c b/src/tube-stream.c
index dd79a04..0075215 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -44,7 +44,6 @@
 
 #include "debug.h"
 #include "signals-marshal.h"
-#include "extensions/extensions.h"
 #include "salut-connection.h"
 #include "tube-iface.h"
 #include "salut-bytestream-manager.h"
-- 
1.5.6.5