Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: look at environment variables by hand if PyXDG isn't avai...
by Éric Araujo 07 Feb '10

07 Feb '10

changeset fa23af7471f4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa23af7471f4 description: look at environment variables by hand if PyXDG isn't available. see #2149 diffstat: src/common/configpaths.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (20 lines): diff -r b6ea0da29b13 -r fa23af7471f4 src/common/configpaths.py --- a/src/common/configpaths.py Sat Feb 06 20:22:28 2010 +0100 +++ b/src/common/configpaths.py Sun Feb 07 17:52:15 2010 +0100 @@ -103,9 +103,13 @@ self.data_root = os.path.join(xdg.BaseDirectory.\ xdg_data_dirs[0], u'gajim') else: - self.config_root = os.path.expanduser(u'~/.config/gajim') - self.cache_root = os.path.expanduser(u'~/.cache/gajim') - self.data_root = os.path.expanduser(u'~/.local/share/gajim') + expand = os.path.expanduser + base = os.getenv('XDG_CONFIG_HOME') or expand(u'~/.config') + self.config_root = os.path.join(base, u'gajim') + base = os.getenv('XDG_CACHE_HOME') or expand(u'~/.cache') + self.cache_root = os.path.join(base, u'gajim') + base = os.getenv('XDG_DATA_HOME') or expand(u'~/.local/share') + self.data_root = os.path.join(base, u'gajim') def add(self, name, type_, path): self.paths[name] = (type_, path)

1 0

gajim: don't call cancel handler after we call ok handler
by Yann Leboulanger 06 Feb '10

06 Feb '10

changeset b6ea0da29b13 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b6ea0da29b13 description: don't call cancel handler after we call ok handler diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 048ebdc029f1 -r b6ea0da29b13 src/dialogs.py --- a/src/dialogs.py Fri Feb 05 21:56:18 2010 +0100 +++ b/src/dialogs.py Sat Feb 06 20:22:28 2010 +0100 @@ -1626,6 +1626,7 @@ *self.user_response_ok[1:]) else: self.user_response_ok(self.is_checked()) + self.call_cancel_on_destroy = False self.destroy() def on_response_cancel(self, widget):

1 0

gajim: fix log file path
by Yann Leboulanger 05 Feb '10

05 Feb '10

changeset 048ebdc029f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=048ebdc029f1 description: fix log file path diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bc217d4df0e4 -r 048ebdc029f1 src/gajim.py --- a/src/gajim.py Fri Feb 05 21:03:40 2010 +0100 +++ b/src/gajim.py Fri Feb 05 21:56:18 2010 +0100 @@ -114,7 +114,7 @@ _file = None _error = None def write(self, text): - fname=os.path.join(common.configpaths.gajimpaths.root, + fname=os.path.join(common.configpaths.gajimpaths.cache_root, os.path.split(sys.executable)[1]+'.log') if self._file is None and self._error is None: try:

1 0

gajim: merge
by Yann Leboulanger 05 Feb '10

05 Feb '10

changeset bc217d4df0e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc217d4df0e4 description: merge diffstat: src/chat_control.py | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diffs (21 lines): diff -r 9090f33b4581 -r bc217d4df0e4 src/chat_control.py --- a/src/chat_control.py Fri Feb 05 20:13:49 2010 +0100 +++ b/src/chat_control.py Fri Feb 05 21:03:40 2010 +0100 @@ -553,15 +553,10 @@ widget.modify_fg(gtk.STATE_NORMAL, fg_color) self.connect_style_event(widget, opts[0], opts[1]) - def _conv_textview_key_press_event(self, widget, event): - # translate any layout to latin_layout - keymap = gtk.gdk.keymap_get_default() - keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] - keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] - if (event.state & gtk.gdk.CONTROL_MASK and keyval in (keycodec, + if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c, gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ - keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): + event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event) return True

1 0

gajim: move files from ~/.gajim to XDG folders
by Yann Leboulanger 05 Feb '10

05 Feb '10

changeset 9090f33b4581 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9090f33b4581 description: move files from ~/.gajim to XDG folders diffstat: src/common/check_paths.py | 129 +++++++++++++++++++++++++++++++++++++++++++++- src/common/optparser.py | 28 --------- 2 files changed, 128 insertions(+), 29 deletions(-) diffs (194 lines): diff -r 7ba8adb1159e -r 9090f33b4581 src/common/check_paths.py --- a/src/common/check_paths.py Thu Feb 04 20:08:30 2010 +0100 +++ b/src/common/check_paths.py Fri Feb 05 20:13:49 2010 +0100 @@ -35,7 +35,6 @@ def create_log_db(): print _('creating logs database') - print logger.LOG_DB_PATH con = sqlite.connect(logger.LOG_DB_PATH) os.chmod(logger.LOG_DB_PATH, 0600) # rw only for us cur = con.cursor() @@ -126,11 +125,139 @@ con.commit() con.close() +def split_db(): + print 'spliting database' + if os.name == 'nt': + try: + OLD_LOG_DB_FOLDER = os.path.join(fse(os.environ[u'appdata']), u'Gajim') + except KeyError: + OLD_LOG_DB_FOLDER = u'.' + else: + OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim') + + tmp = logger.CACHE_DB_PATH + logger.CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db') + create_cache_db() + back = os.getcwd() + os.chdir(OLD_LOG_DB_FOLDER) + con = sqlite.connect('logs.db') + os.chdir(back) + cur = con.cursor() + cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') + tables = cur.fetchall() # we get [(u'jids',), (u'unread_messages',), ... + tables = [t[0] for t in tables] + cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) + for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', + 'roster_group', 'transports_cache'): + if table not in tables: + continue + try: + cur.executescript( + 'INSERT INTO cache.%s SELECT * FROM %s;' % (table, table)) + con.commit() + cur.executescript('DROP TABLE %s;' % table) + con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, 'error moving table %s to cache.db: %s' % \ + (table, str(e)) + con.close() + logger.CACHE_DB_PATH = tmp + +def check_and_possibly_move_config(): + LOG_DB_PATH = logger.LOG_DB_PATH + CACHE_DB_PATH = logger.CACHE_DB_PATH + vars = {} + vars['VCARD_PATH'] = gajim.VCARD_PATH + vars['AVATAR_PATH'] = gajim.AVATAR_PATH + vars['MY_EMOTS_PATH'] = gajim.MY_EMOTS_PATH + vars['MY_ICONSETS_PATH'] = gajim.MY_ICONSETS_PATH + vars['MY_MOOD_ICONSETS_PATH'] = gajim.MY_MOOD_ICONSETS_PATH + vars['MY_ACTIVITY_ICONSETS_PATH'] = gajim.MY_ACTIVITY_ICONSETS_PATH + import configpaths + MY_DATA = configpaths.gajimpaths['MY_DATA'] + MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] + MY_CACHE = configpaths.gajimpaths['MY_CACHE'] + + if os.path.exists(LOG_DB_PATH): + # File already exists + return + + if os.name == 'nt': + try: + OLD_LOG_DB_FOLDER = os.path.join(fse(os.environ[u'appdata']), u'Gajim') + except KeyError: + OLD_LOG_DB_FOLDER = u'.' + else: + OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim') + if not os.path.exists(OLD_LOG_DB_FOLDER): + return + OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'logs.db') + OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'cache.db') + vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'vcards') + vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'avatars') + vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'emoticons') + vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'iconsets') + vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'moods') + vars['OLD_MY_ACTIVITY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, + u'activities') + OLD_CONFIG_FILES = [] + OLD_DATA_FILES = [] + for f in os.listdir(OLD_LOG_DB_FOLDER): + if f == 'config' or f.startswith('config.'): + OLD_CONFIG_FILES.append(f) + if f == 'secrets' or f.startswith('secrets.'): + OLD_DATA_FILES.append(f) + if f == 'cacerts.pem': + OLD_DATA_FILES.append(f) + + if not os.path.exists(OLD_LOG_DB_PATH): + return + + if not os.path.exists(OLD_CACHE_DB_PATH): + # split database + split_db() + + to_move = {} + to_move[OLD_LOG_DB_PATH] = LOG_DB_PATH + to_move[OLD_CACHE_DB_PATH] = CACHE_DB_PATH + + for folder in ('VCARD_PATH', 'AVATAR_PATH', 'MY_EMOTS_PATH', + 'MY_ICONSETS_PATH', 'MY_MOOD_ICONSETS_PATH', 'MY_ACTIVITY_ICONSETS_PATH'): + src = vars['OLD_' + folder] + dst = vars[folder] + to_move[src] = dst + + # move config files + for f in OLD_CONFIG_FILES: + src = os.path.join(OLD_LOG_DB_FOLDER, f) + dst = os.path.join(MY_CONFIG, f) + to_move[src] = dst + + # Move data files (secrets, cacert.pem) + for f in OLD_DATA_FILES: + src = os.path.join(OLD_LOG_DB_FOLDER, f) + dst = os.path.join(MY_DATA, f) + to_move[src] = dst + + for src, dst in to_move.items(): + if os.path.exists(dst): + continue + if not os.path.exists(src): + continue + print 'moving %s to %s' % (src, dst) + os.renames(src, dst) + gajim.logger.init_vars() + gajim.logger.attach_cache_database() + def check_and_possibly_create_paths(): + check_and_possibly_move_config() + LOG_DB_PATH = logger.LOG_DB_PATH LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) + CACHE_DB_PATH = logger.CACHE_DB_PATH CACHE_DB_FOLDER, CACHE_DB_FILE = os.path.split(CACHE_DB_PATH) + VCARD_PATH = gajim.VCARD_PATH AVATAR_PATH = gajim.AVATAR_PATH import configpaths diff -r 7ba8adb1159e -r 9090f33b4581 src/common/optparser.py --- a/src/common/optparser.py Thu Feb 04 20:08:30 2010 +0100 +++ b/src/common/optparser.py Fri Feb 05 20:13:49 2010 +0100 @@ -217,8 +217,6 @@ self.update_config_to_013100() if old < [0, 13, 10, 1] and new >= [0, 13, 10, 1]: self.update_config_to_013101() - if old < [0, 13, 10, 2] and new >= [0, 13, 10, 2]: - self.update_config_to_013102() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -884,30 +882,4 @@ con.close() gajim.config.set('version', '0.13.10.1') - def update_config_to_013102(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') - tables = cur.fetchall() # we get [(u'jids',), (u'unread_messages',), ... - tables = [t[0] for t in tables] - cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) - for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', - 'roster_group', 'transports_cache'): - if table not in tables: - continue - try: - cur.executescript( - 'INSERT INTO cache.%s SELECT * FROM %s;' % (table, table)) - con.commit() - cur.executescript('DROP TABLE %s;' % table) - con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, 'error moving table %s to cache.db: %s' % \ - (table, str(e)) - con.close() - gajim.config.set('version', '0.13.10.2') - # vim: se ts=3:

1 0

gajim: use and create files in folders using XDG standards. Fixe...
by Yann Leboulanger 05 Feb '10

05 Feb '10

changeset 7ba8adb1159e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ba8adb1159e description: use and create files in folders using XDG standards. Fixes #2149 diffstat: src/common/check_paths.py | 110 +++++++++++++++++++++++---------------- src/common/configpaths.py | 126 +++++++++++++++++++++++++++------------------ src/common/gajim.py | 1 - src/common/helpers.py | 7 +- 4 files changed, 144 insertions(+), 100 deletions(-) diffs (truncated from 353 to 300 lines): diff -r 78954ac58582 -r 7ba8adb1159e src/common/check_paths.py --- a/src/common/check_paths.py Thu Feb 04 19:34:01 2010 +0100 +++ b/src/common/check_paths.py Thu Feb 04 20:08:30 2010 +0100 @@ -35,6 +35,7 @@ def create_log_db(): print _('creating logs database') + print logger.LOG_DB_PATH con = sqlite.connect(logger.LOG_DB_PATH) os.chmod(logger.LOG_DB_PATH, 0600) # rw only for us cur = con.cursor() @@ -127,61 +128,80 @@ def check_and_possibly_create_paths(): LOG_DB_PATH = logger.LOG_DB_PATH + LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) CACHE_DB_PATH = logger.CACHE_DB_PATH + CACHE_DB_FOLDER, CACHE_DB_FILE = os.path.split(CACHE_DB_PATH) VCARD_PATH = gajim.VCARD_PATH AVATAR_PATH = gajim.AVATAR_PATH - dot_gajim = os.path.dirname(VCARD_PATH) - if os.path.isfile(dot_gajim): - print _('%s is a file but it should be a directory') % dot_gajim + import configpaths + MY_DATA = configpaths.gajimpaths['MY_DATA'] + MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] + MY_CACHE = configpaths.gajimpaths['MY_CACHE'] + + if not os.path.exists(MY_DATA): + create_path(MY_DATA) + elif os.path.isfile(MY_DATA): + print _('%s is a file but it should be a directory') % MY_DATA print _('Gajim will now exit') sys.exit() - elif os.path.isdir(dot_gajim): - s = os.stat(dot_gajim) - if s.st_mode & stat.S_IROTH: # others have read permission! - os.chmod(dot_gajim, 0700) # rwx------ - if not os.path.exists(VCARD_PATH): - create_path(VCARD_PATH) - elif os.path.isfile(VCARD_PATH): - print _('%s is a file but it should be a directory') % VCARD_PATH - print _('Gajim will now exit') - sys.exit() + if not os.path.exists(MY_CONFIG): + create_path(MY_CONFIG) + elif os.path.isfile(MY_CONFIG): + print _('%s is a file but it should be a directory') % MY_CONFIG + print _('Gajim will now exit') + sys.exit() - if not os.path.exists(AVATAR_PATH): - create_path(AVATAR_PATH) - elif os.path.isfile(AVATAR_PATH): - print _('%s is a file but it should be a directory') % AVATAR_PATH - print _('Gajim will now exit') - sys.exit() + if not os.path.exists(MY_CACHE): + create_path(MY_CACHE) + elif os.path.isfile(MY_CACHE): + print _('%s is a file but it should be a directory') % MY_CACHE + print _('Gajim will now exit') + sys.exit() - if not os.path.exists(LOG_DB_PATH): - create_log_db() - gajim.logger.init_vars() - elif os.path.isdir(LOG_DB_PATH): - print _('%s is a directory but should be a file') % LOG_DB_PATH - print _('Gajim will now exit') - sys.exit() + if not os.path.exists(VCARD_PATH): + create_path(VCARD_PATH) + elif os.path.isfile(VCARD_PATH): + print _('%s is a file but it should be a directory') % VCARD_PATH + print _('Gajim will now exit') + sys.exit() - if not os.path.exists(CACHE_DB_PATH): - create_cache_db() - elif os.path.isdir(CACHE_DB_PATH): - print _('%s is a directory but should be a file') % CACHE_DB_PATH - print _('Gajim will now exit') - sys.exit() + if not os.path.exists(AVATAR_PATH): + create_path(AVATAR_PATH) + elif os.path.isfile(AVATAR_PATH): + print _('%s is a file but it should be a directory') % AVATAR_PATH + print _('Gajim will now exit') + sys.exit() - else: # dot_gajim doesn't exist - if dot_gajim: # is '' on win9x so avoid that - create_path(dot_gajim) - if not os.path.isdir(VCARD_PATH): - create_path(VCARD_PATH) - if not os.path.exists(AVATAR_PATH): - create_path(AVATAR_PATH) - if not os.path.isfile(LOG_DB_PATH): - create_log_db() - gajim.logger.init_vars() - if not os.path.isfile(CACHE_DB_PATH): - create_cache_db() - gajim.logger.attach_cache_database() + if not os.path.exists(LOG_DB_FOLDER): + create_path(LOG_DB_FOLDER) + elif os.path.isfile(LOG_DB_FOLDER): + print _('%s is a file but it should be a directory') % LOG_DB_FOLDER + print _('Gajim will now exit') + sys.exit() + + if not os.path.exists(LOG_DB_PATH): + create_log_db() + gajim.logger.init_vars() + elif os.path.isdir(LOG_DB_PATH): + print _('%s is a directory but should be a file') % LOG_DB_PATH + print _('Gajim will now exit') + sys.exit() + + if not os.path.exists(CACHE_DB_FOLDER): + create_path(CACHE_DB_FOLDER) + elif os.path.isfile(CACHE_DB_FOLDER): + print _('%s is a file but it should be a directory') % CACHE_DB_FOLDER + print _('Gajim will now exit') + sys.exit() + + if not os.path.exists(CACHE_DB_PATH): + create_cache_db() + gajim.logger.attach_cache_database() + elif os.path.isdir(CACHE_DB_PATH): + print _('%s is a directory but should be a file') % CACHE_DB_PATH + print _('Gajim will now exit') + sys.exit() def create_path(directory): print _('creating %s directory') % directory diff -r 78954ac58582 -r 7ba8adb1159e src/common/configpaths.py --- a/src/common/configpaths.py Thu Feb 04 19:34:01 2010 +0100 +++ b/src/common/configpaths.py Thu Feb 04 20:08:30 2010 +0100 @@ -26,6 +26,17 @@ import sys import tempfile import defs +HAVE_XDG = True +try: + import xdg.BaseDirectory +except: + HAVE_XDG = False + +( +TYPE_CONFIG, +TYPE_CACHE, +TYPE_DATA +) = range(3) # Note on path and filename encodings: # @@ -58,37 +69,56 @@ return s class ConfigPaths: - def __init__(self, root=None): - self.root = root + def __init__(self): + # {'name': (type, path), } type can be TYPE_CONFIG, TYPE_CACHE, TYPE_DATA + # or None self.paths = {} - if self.root is None: - if os.name == 'nt': - try: - # Documents and Settings\[User Name]\Application Data\Gajim + if os.name == 'nt': + try: + # Documents and Settings\[User Name]\Application Data\Gajim - # How are we supposed to know what encoding the environment - # variable 'appdata' is in? Assuming it to be in filesystem - # encoding. - self.root = os.path.join(fse(os.environ[u'appdata']), u'Gajim') - except KeyError: - # win9x, in cwd - self.root = u'.' - else: # Unices - # Pass in an Unicode string, and hopefully get one back. - self.root = os.path.expanduser(u'~/.gajim') + # How are we supposed to know what encoding the environment + # variable 'appdata' is in? Assuming it to be in filesystem + # encoding. + self.config_root = self.cache_root = self.data_root = \ + os.path.join(fse(os.environ[u'appdata']), u'Gajim') + except KeyError: + # win9x, in cwd + self.config_root = self.cache_root = self.data_root = u'.' + else: # Unices + # Pass in an Unicode string, and hopefully get one back. + if HAVE_XDG: + self.config_root = xdg.BaseDirectory.load_first_config('gajim') + if not self.config_root: + # Folder doesn't exist yet. + self.config_root = os.path.join(xdg.BaseDirectory.\ + xdg_config_dirs[0], u'gajim') - def add_from_root(self, name, path): - self.paths[name] = (True, path) + self.cache_root = os.path.join(xdg.BaseDirectory.xdg_cache_home, + u'gajim') - def add(self, name, path): - self.paths[name] = (False, path) + self.data_root = xdg.BaseDirectory.save_data_path('gajim') + if not self.data_root: + self.data_root = os.path.join(xdg.BaseDirectory.\ + xdg_data_dirs[0], u'gajim') + else: + self.config_root = os.path.expanduser(u'~/.config/gajim') + self.cache_root = os.path.expanduser(u'~/.cache/gajim') + self.data_root = os.path.expanduser(u'~/.local/share/gajim') + + def add(self, name, type_, path): + self.paths[name] = (type_, path) def __getitem__(self, key): - relative, path = self.paths[key] - if not relative: - return path - return os.path.join(self.root, path) + type_, path = self.paths[key] + if type_ == TYPE_CONFIG: + return os.path.join(self.config_root, path) + elif type_ == TYPE_CACHE: + return os.path.join(self.cache_root, path) + elif type_ == TYPE_DATA: + return os.path.join(self.data_root, path) + return path def get(self, key, default=None): try: @@ -100,33 +130,33 @@ for key in self.paths.iterkeys(): yield (key, self[key]) - def init(self, root = None): + def init(self, root=None): if root is not None: - self.root = root + self.config_root = self.cache_root = self.data_root = root - # LOG is deprecated - k = ( 'LOG', 'LOG_DB', 'CACHE_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', - 'MY_ICONSETS', 'MY_MOOD_ICONSETS', 'MY_ACTIVITY_ICONSETS', - 'MY_CACERTS') - v = (u'logs', u'logs.db', u'cache.db', u'vcards', u'avatars', - u'emoticons', u'iconsets', u'moods', u'activities', u'cacerts.pem') + d = {'MY_DATA': '', 'LOG_DB': u'logs.db', 'MY_CACERTS': u'cacerts.pem', + 'MY_EMOTS': u'emoticons', 'MY_ICONSETS': u'iconsets', + 'MY_MOOD_ICONSETS': u'moods', 'MY_ACTIVITY_ICONSETS': u'activities'} + for name in d: + self.add(name, TYPE_DATA, windowsify(d[name])) - if os.name == 'nt': - v = [x.capitalize() for x in v] + d = {'MY_CACHE': '', 'CACHE_DB': u'cache.db', 'VCARD': u'vcards', + 'AVATAR': u'avatars'} + for name in d: + self.add(name, TYPE_CACHE, windowsify(d[name])) - for n, p in zip(k, v): - self.add_from_root(n, p) + self.add('MY_CONFIG', TYPE_CONFIG, '') basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) - self.add('DATA', os.path.join(basedir, windowsify(u'data'))) - self.add('ICONS', os.path.join(basedir, windowsify(u'icons'))) - self.add('HOME', fse(os.path.expanduser('~'))) + self.add('DATA', None, os.path.join(basedir, windowsify(u'data'))) + self.add('ICONS', None, os.path.join(basedir, windowsify(u'icons'))) + self.add('HOME', None, fse(os.path.expanduser('~'))) try: - self.add('TMP', fse(tempfile.gettempdir())) + self.add('TMP', None, fse(tempfile.gettempdir())) except IOError, e: print >> sys.stderr, 'Error opening tmp folder: %s\nUsing %s' % ( str(e), os.path.expanduser('~')) - self.add('TMP', fse(os.path.expanduser('~'))) + self.add('TMP', None, fse(os.path.expanduser('~'))) try: import svn_config @@ -134,10 +164,7 @@ except (ImportError, AttributeError): pass - # for k, v in paths.iteritems(): - # print "%s: %s" % (repr(k), repr(v)) - - def init_profile(self, profile = ''): + def init_profile(self, profile=''): conffile = windowsify(u'config')

1 0

gajim: revert unwanted changes in [428adcf83dc7]
by Yann Leboulanger 05 Feb '10

05 Feb '10

changeset 72dfb77b3a1b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=72dfb77b3a1b description: revert unwanted changes in [428adcf83dc7] diffstat: src/chat_control.py | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diffs (21 lines): diff -r 78954ac58582 -r 72dfb77b3a1b src/chat_control.py --- a/src/chat_control.py Thu Feb 04 19:34:01 2010 +0100 +++ b/src/chat_control.py Fri Feb 05 07:21:12 2010 +0100 @@ -553,15 +553,10 @@ widget.modify_fg(gtk.STATE_NORMAL, fg_color) self.connect_style_event(widget, opts[0], opts[1]) - def _conv_textview_key_press_event(self, widget, event): - # translate any layout to latin_layout - keymap = gtk.gdk.keymap_get_default() - keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] - keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] - if (event.state & gtk.gdk.CONTROL_MASK and keyval in (keycodec, + if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c, gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ - keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): + event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event) return True

1 0

gajim: don't call twice cancel handler
by Yann Leboulanger 04 Feb '10

04 Feb '10

changeset 78954ac58582 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78954ac58582 description: don't call twice cancel handler diffstat: src/dialogs.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (32 lines): diff -r c29485e7575a -r 78954ac58582 src/dialogs.py --- a/src/dialogs.py Wed Feb 03 23:20:11 2010 +0100 +++ b/src/dialogs.py Thu Feb 04 19:34:01 2010 +0100 @@ -1290,8 +1290,9 @@ class HigDialog(gtk.MessageDialog): def __init__(self, parent, type_, buttons, pritext, sectext, - on_response_ok = None, on_response_cancel = None, on_response_yes = None, - on_response_no = None): + on_response_ok=None, on_response_cancel=None, on_response_yes=None, + on_response_no=None): + self.call_cancel_on_destroy = True gtk.MessageDialog.__init__(self, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, type_, buttons, message_format = pritext) @@ -1319,6 +1320,8 @@ self.connect('destroy', self.on_dialog_destroy) def on_dialog_destroy(self, widget): + if not self.call_cancel_on_destroy: + return cancel_handler = self.possible_responses[gtk.STOCK_CANCEL] if not cancel_handler: return False @@ -1631,6 +1634,7 @@ self.user_response_cancel[0](*self.user_response_cancel[1:]) else: self.user_response_cancel() + self.call_cancel_on_destroy = False self.destroy() def is_checked(self):

1 0

gajim: increase SRV answer timeout. Fixes #5466
by Yann Leboulanger 03 Feb '10

03 Feb '10

changeset c29485e7575a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c29485e7575a description: increase SRV answer timeout. Fixes #5466 diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 81a9c1912228 -r c29485e7575a src/common/resolver.py --- a/src/common/resolver.py Wed Feb 03 22:13:52 2010 +0100 +++ b/src/common/resolver.py Wed Feb 03 23:20:11 2010 +0100 @@ -284,7 +284,7 @@ """ ns = NsLookup(self._on_ready, host, type) ns.set_idlequeue(self.idlequeue) - ns.commandtimeout = 10 + ns.commandtimeout = 20 ns.start()

1 0

gajim: When there is an error connecting to an account, close on...
by Yann Leboulanger 03 Feb '10

03 Feb '10

changeset 81a9c1912228 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=81a9c1912228 description: When there is an error connecting to an account, close only this account's pass dialog. Fixes #5586 diffstat: src/gui_interface.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 744b23bdb439 -r 81a9c1912228 src/gui_interface.py --- a/src/gui_interface.py Wed Feb 03 21:16:38 2010 +0100 +++ b/src/gui_interface.py Wed Feb 03 22:13:52 2010 +0100 @@ -220,8 +220,7 @@ for request in self.gpg_passphrase.values(): if request: request.interrupt() - # .keys() is needed because dict changes during loop - for account in self.pass_dialog.keys(): + if account in self.pass_dialog: self.pass_dialog[account].window.destroy() if show == 'offline': # sensitivity for this menuitem

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010