copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add pep_supported var to pep branch too

This commit is contained in:
Yann Leboulanger 2007-03-30 19:16:44 +00:00
parent 39f161fa6d
commit c02eb73bd0
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/connection.py
View File

@ -81,6 +81,7 @@ class Connection(ConnectionHandlers):
else: else:
self.keepalives = 0 self.keepalives = 0
self.privacy_rules_supported = False self.privacy_rules_supported = False
self.pep_supported = False
# Do we continue connection when we get roster (send presence,get vcard...) # Do we continue connection when we get roster (send presence,get vcard...)
self.continue_connect_info = None self.continue_connect_info = None
if USE_GPG: if USE_GPG:

8
src/common/connection_handlers.py
View File

@ -794,6 +794,12 @@ class ConnectionDisco:
#FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225
identities = [{'category': 'server', 'type': 'im', 'name': node}] identities = [{'category': 'server', 'type': 'im', 'name': node}]
if id[0] == 'p': 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): if features.__contains__(common.xmpp.NS_BYTESTREAM):
gajim.proxy65_manager.resolve(jid, self.connection, self.name) gajim.proxy65_manager.resolve(jid, self.connection, self.name)
if features.__contains__(common.xmpp.NS_MUC) and is_muc: 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) gajim.proxy65_manager.resolve(proxy, self.connection)
self.discoverItems(gajim.config.get_per('accounts', self.name, self.discoverItems(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='p') 'hostname'), id_prefix='p')
self.discoverInfo(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='p')
def _on_roster_set(self, roster): def _on_roster_set(self, roster):
raw_roster = roster.getRaw() raw_roster = roster.getRaw()

1
src/common/zeroconf/connection_zeroconf.py
View File

@ -74,6 +74,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
self.sync_with_global_status = True self.sync_with_global_status = True
self.no_log_for = False self.no_log_for = False
self.pep_supported = False
# Do we continue connection when we get roster (send presence,get vcard...) # Do we continue connection when we get roster (send presence,get vcard...)
self.continue_connect_info = None self.continue_connect_info = None
if USE_GPG: if USE_GPG: