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

keep resource that come from server

This commit is contained in:
Dimitur Kirov 2005-09-07 15:32:31 +00:00
parent fec1eb1c5c
commit 3676f7f80b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/connection.py
View File

@ -134,6 +134,7 @@ class Connection:
self.last_sent = [] self.last_sent = []
self.files_props = {} self.files_props = {}
self.password = gajim.config.get_per('accounts', name, 'password') self.password = gajim.config.get_per('accounts', name, 'password')
self.server_resource = gajim.config.get_per('accounts', name, 'resource')
self.privacy_rules_supported = False self.privacy_rules_supported = False
if USE_GPG: if USE_GPG:
self.gpg = GnuPG.GnuPG() self.gpg = GnuPG.GnuPG()
@ -882,7 +883,7 @@ class Connection:
file_props['mime-type'] = mime_type file_props['mime-type'] = mime_type
name = gajim.config.get_per('accounts', self.name, 'name') name = gajim.config.get_per('accounts', self.name, 'name')
hostname = gajim.config.get_per('accounts', self.name, 'hostname') hostname = gajim.config.get_per('accounts', self.name, 'hostname')
resource = gajim.config.get_per('accounts', self.name, 'resource') resource = self.server_resource
file_props['receiver'] = name + '@' + hostname + '/' + resource file_props['receiver'] = name + '@' + hostname + '/' + resource
file_props['sender'] = iq_obj.getFrom() file_props['sender'] = iq_obj.getFrom()
file_props['request-id'] = unicode(iq_obj.getAttr('id')) file_props['request-id'] = unicode(iq_obj.getAttr('id'))
@ -940,7 +941,7 @@ class Connection:
def send_file_request(self, file_props): def send_file_request(self, file_props):
name = gajim.config.get_per('accounts', self.name, 'name') name = gajim.config.get_per('accounts', self.name, 'name')
hostname = gajim.config.get_per('accounts', self.name, 'hostname') hostname = gajim.config.get_per('accounts', self.name, 'hostname')
resource = gajim.config.get_per('accounts', self.name, 'resource') resource = self.server_resource
frm = name + '@' + hostname + '/' + resource frm = name + '@' + hostname + '/' + resource
file_props['sender'] = frm file_props['sender'] = frm
fjid = file_props['receiver'].jid + '/' + file_props['receiver'].resource fjid = file_props['receiver'].jid + '/' + file_props['receiver'].resource
@ -1129,7 +1130,9 @@ class Connection:
roster = self.connection.getRoster().getRaw() roster = self.connection.getRoster().getRaw()
if not roster: if not roster:
roster = {} roster = {}
if iq_obj.getTo() is not None:
self.server_resource = iq_obj.getTo().getResource()
name = gajim.config.get_per('accounts', self.name, 'name') name = gajim.config.get_per('accounts', self.name, 'name')
hostname = gajim.config.get_per('accounts', self.name, 'hostname') hostname = gajim.config.get_per('accounts', self.name, 'hostname')
if roster.has_key(name + '@' + hostname): if roster.has_key(name + '@' + hostname):