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

Fix running Gajim under windows for users with non-ascii char in account name. Fixes #5852

This commit is contained in:
Yann Leboulanger 2010-09-10 21:31:25 +02:00
parent 9f644dade0
commit 96de172951
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,8 @@ from common.zeroconf import client_zeroconf
from common.zeroconf import zeroconf from common.zeroconf import zeroconf
from connection_handlers_zeroconf import * from connection_handlers_zeroconf import *
import locale
class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
def __init__(self, name): def __init__(self, name):
ConnectionHandlersZeroconf.__init__(self) ConnectionHandlersZeroconf.__init__(self)
@ -105,7 +107,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
'zeroconf_email') 'zeroconf_email')
if not self.username: if not self.username:
self.username = unicode(getpass.getuser()) self.username = unicode(getpass.getuser(),
locale.getpreferredencoding())
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name', gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name',
self.username) self.username)
else: else:

5
src/plugins/plugin.py
View File

@ -25,6 +25,7 @@ Base class for implementing plugin.
''' '''
import os import os
import locale
from common import gajim from common import gajim
@ -197,7 +198,9 @@ class GajimPluginConfig(UserDict.DictMixin):
@log_calls('GajimPluginConfig') @log_calls('GajimPluginConfig')
def __init__(self, plugin): def __init__(self, plugin):
self.plugin = plugin self.plugin = plugin
self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name) self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR,
self.plugin.short_name).decode('utf-8').encode(
locale.getpreferredencoding())
#log.debug('FILE_PATH = %s'%(self.FILE_PATH)) #log.debug('FILE_PATH = %s'%(self.FILE_PATH))
self.data = None self.data = None
self.load() self.load()