[telepathy-gabble/master] don't instantiate WockyPubsub anymore

[Guillaume Desmottes]

---
 src/connection.c |   10 ----------
 src/connection.h |    3 +--
 2 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 44cb5e2..30c7928 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -68,7 +68,6 @@
 #include "olpc-gadget-manager.h"
 #include "presence-cache.h"
 #include "presence.h"
-#include "wocky-pubsub.h"
 #include "request-pipeline.h"
 #include "roomlist-manager.h"
 #include "roster.h"
@@ -327,8 +326,6 @@ gabble_connection_constructor (GType type,
 
   tp_base_connection_register_with_contacts_mixin (TP_BASE_CONNECTION (self));
 
-  self->pubsub = wocky_pubsub_new ();
-
   conn_aliasing_init (self);
   conn_avatars_init (self);
   conn_presence_init (self);
@@ -1026,12 +1023,6 @@ gabble_connection_dispose (GObject *object)
       self->pep_olpc_act_props = NULL;
     }
 
-  if (self->pubsub != NULL)
-    {
-      g_object_unref (self->pubsub);
-      self->pubsub = NULL;
-    }
-
   if (G_OBJECT_CLASS (gabble_connection_parent_class)->dispose)
     G_OBJECT_CLASS (gabble_connection_parent_class)->dispose (object);
 }
@@ -1562,7 +1553,6 @@ connector_connected (GabbleConnection *self,
 
   lm_connection_set_porter (self->lmconn, priv->porter);
 
-  wocky_pubsub_start (self->pubsub, self->session);
   wocky_pep_service_start (self->pep_location, self->session);
   wocky_pep_service_start (self->pep_nick, self->session);
   wocky_pep_service_start (self->pep_olpc_buddy_props, self->session);
diff --git a/src/connection.h b/src/connection.h
index 4210ece..a1c76a5 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -192,8 +192,7 @@ struct _GabbleConnection {
     /* file transfer manager */
     GabbleFtManager *ft_manager;
 
-    /* pubsub */
-    WockyPubsub *pubsub;
+    /* PEP */
     WockyPepService *pep_nick;
     WockyPepService *pep_location;
     WockyPepService *pep_olpc_buddy_props;
-- 
1.5.6.5