Author: asterix Date: 2007-03-28 16:25:47 +0200 (Wed, 28 Mar 2007) New Revision: 8033

Modified: trunk/src/common/connection.py Log: substitute $hostname in resource by hostname of the machine. fixes #3060

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-28 14:20:50 UTC (rev 8032) +++ trunk/src/common/connection.py 2007-03-28 14:25:47 UTC (rev 8033) @@ -17,9 +17,9 @@ ## GNU General Public License for more details. ##

- import os import random +import socket

try: randomsource = random.SystemRandom() @@ -42,6 +42,7 @@

from common.rst_xhtml_generator import create_xhtml

+from string import Template import logging log = logging.getLogger('gajim.c.connection')

@@ -76,6 +77,10 @@ self.last_history_line = {} self.password = passwords.get_password(name) self.server_resource = gajim.config.get_per('accounts', name, 'resource') + # All valid resource substitution strings should be added to this hash. + self.server_resource = Template(self.server_resource).safe_substitute({ + 'hostname': socket.gethostname() + }) if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): self.keepalives = gajim.config.get_per('accounts', self.name,'keep_alive_every_foo_secs') else: