From c02eb73bd0df0baaf9434aa9f11313e405c2c474 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 30 Mar 2007 19:16:44 +0000
Subject: [PATCH] add pep_supported var to pep branch too
---
src/common/connection.py | 1 +
src/common/connection_handlers.py | 8 ++++++++
src/common/zeroconf/connection_zeroconf.py | 1 +
3 files changed, 10 insertions(+)
diff --git a/src/common/connection.py b/src/common/connection.py
index 6142270775..4abdd590a9 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -81,6 +81,7 @@ class Connection(ConnectionHandlers):
else:
self.keepalives = 0
self.privacy_rules_supported = False
+ self.pep_supported = False
# Do we continue connection when we get roster (send presence,get vcard...)
self.continue_connect_info = None
if USE_GPG:
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index b2e1a3318b..5e55e8e0a5 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -794,6 +794,12 @@ class ConnectionDisco:
#FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225
identities = [{'category': 'server', 'type': 'im', 'name': node}]
if id[0] == 'p':
+ if jid == gajim.config.get_per('accounts', self.name, 'hostname'):
+ for identity in identities:
+ if identity['category'] == 'pubsub' and identity['type'] == \
+ 'pep':
+ self.pep_supported = True
+ break
if features.__contains__(common.xmpp.NS_BYTESTREAM):
gajim.proxy65_manager.resolve(jid, self.connection, self.name)
if features.__contains__(common.xmpp.NS_MUC) and is_muc:
@@ -1860,6 +1866,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
gajim.proxy65_manager.resolve(proxy, self.connection)
self.discoverItems(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='p')
+ self.discoverInfo(gajim.config.get_per('accounts', self.name,
+ 'hostname'), id_prefix='p')
def _on_roster_set(self, roster):
raw_roster = roster.getRaw()
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index 148893c7f4..5bdb7104ab 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -74,6 +74,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
self.sync_with_global_status = True
self.no_log_for = False
+ self.pep_supported = False
# Do we continue connection when we get roster (send presence,get vcard...)
self.continue_connect_info = None
if USE_GPG:
--
GitLab