Commits December 2011

commits@gajim.org

3 participants
147 discussions

gajim: fix upgrading from old plugin config files
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 3f7a9d2d9d3c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3f7a9d2d9d3c description: fix upgrading from old plugin config files diffstat: src/plugins/plugin.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 56189a05a71d -r 3f7a9d2d9d3c src/plugins/plugin.py --- a/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300 +++ b/src/plugins/plugin.py Tue Oct 11 21:44:02 2011 +0200 @@ -264,9 +264,10 @@ '%s and creating a new one' % (self.plugin.short_name, self.FILE_PATH + '.bak')) if os.path.exists(self.FILE_PATH + '.bak'): - os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') - self.data = {} - self.save() + os.remove(self.FILE_PATH + '.bak') + os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') + self.data = {} + self.save() else: self.data = {} self.save()

1 0

gajim: prevent traceback
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 56189a05a71d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56189a05a71d description: prevent traceback diffstat: src/plugins/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3f78f1bc6cff -r 56189a05a71d src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300 +++ b/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300 @@ -203,7 +203,7 @@ self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name).decode('utf-8').encode( locale.getpreferredencoding()) - self.data = None + self.data = {} @log_calls('GajimPluginConfig') def __getitem__(self, key):

1 0

gajim: fix previos commit
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 3f78f1bc6cff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3f78f1bc6cff description: fix previos commit diffstat: src/plugins/plugin.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 410a7f1ea00b -r 3f78f1bc6cff src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Oct 10 16:43:22 2011 +0200 +++ b/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300 @@ -234,6 +234,9 @@ def keys(self): return self.data.keys() + def items(self): + return self.data.items() + @log_calls('GajimPluginConfig') def save(self): fd = open(self.FILE_PATH, 'wb') @@ -242,7 +245,7 @@ @log_calls('GajimPluginConfig') def load(self): - if os.path.isfile('qwe'): + if os.path.isfile(self.FILE_PATH): fd = open(self.FILE_PATH, 'rb') try: self.data = cPickle.load(fd)

1 0

gajim: stop using shelve, it cannot work when upgrading python v...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 410a7f1ea00b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=410a7f1ea00b description: stop using shelve, it cannot work when upgrading python version. Fixes #6988 diffstat: src/plugins/plugin.py | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 7 deletions(-) diffs (88 lines): diff -r 46ddccf66fdd -r 410a7f1ea00b src/plugins/plugin.py --- a/src/plugins/plugin.py Sun Oct 09 13:51:43 2011 +0200 +++ b/src/plugins/plugin.py Mon Oct 10 16:43:22 2011 +0200 @@ -32,6 +32,9 @@ from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog +import logging +log = logging.getLogger('gajim.p.plugin') + class GajimPlugin(object): ''' @@ -191,17 +194,15 @@ def deactivate(self): pass -import shelve -import UserDict +import cPickle -class GajimPluginConfig(UserDict.DictMixin): +class GajimPluginConfig(): @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin 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)) self.data = None @log_calls('GajimPluginConfig') @@ -222,17 +223,51 @@ del self.data[key] self.save() + @log_calls('GajimPluginConfig') + def __contains__(self, key): + return key in self.data + + def __iter__(self): + for k in self.data.keys(): + yield k + def keys(self): return self.data.keys() @log_calls('GajimPluginConfig') def save(self): - self.data.sync() - #log.debug(str(self.data)) + fd = open(self.FILE_PATH, 'wb') + cPickle.dump(self.data, fd) + fd.close() @log_calls('GajimPluginConfig') def load(self): - self.data = shelve.open(self.FILE_PATH) + if os.path.isfile('qwe'): + fd = open(self.FILE_PATH, 'rb') + try: + self.data = cPickle.load(fd) + fd.close() + except EOFError: + fd.close() + try: + import shelve + s = shelve.open(self.FILE_PATH) + for (k, v) in s.iteritems(): + self.data[k] = v + s.close() + self.save() + except: + log.warn('%s plugin config file not readable. Saving it as ' + '%s and creating a new one' % (self.plugin.short_name, + self.FILE_PATH + '.bak')) + if os.path.exists(self.FILE_PATH + '.bak'): + os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') + self.data = {} + self.save() + else: + self.data = {} + self.save() + class GajimPluginException(Exception): pass

1 0

gajim: Fix hotkeys. Fixes #7012
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 46ddccf66fdd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=46ddccf66fdd description: Fix hotkeys. Fixes #7012 diffstat: data/gui/contact_context_menu.ui | 2 +- data/gui/roster_window.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 590fb59de11c -r 46ddccf66fdd data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Sun Oct 09 00:10:22 2011 +0300 +++ b/data/gui/contact_context_menu.ui Sun Oct 09 13:51:43 2011 +0200 @@ -98,7 +98,7 @@ </child> <child> <object class="GtkImageMenuItem" id="manage_contact"> - <property name="label" translatable="yes">_Manage Contact</property> + <property name="label" translatable="yes">M_anage Contact</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> diff -r 590fb59de11c -r 46ddccf66fdd data/gui/roster_window.ui --- a/data/gui/roster_window.ui Sun Oct 09 00:10:22 2011 +0300 +++ b/data/gui/roster_window.ui Sun Oct 09 13:51:43 2011 +0200 @@ -202,7 +202,7 @@ <child> <object class="GtkCheckMenuItem" id="show_transports_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">Show Trans_ports</property> + <property name="label" translatable="yes">Show T_rans_ports</property> <property name="use_underline">True</property> <signal name="activate" handler="on_show_transports_menuitem_activate"/> </object>

1 0

gajim: add 'command_system.implementation.execute'(execute plugi...
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 590fb59de11c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=590fb59de11c description: add 'command_system.implementation.execute'(execute plugin) to demandimport.ignore diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 051870fc9c67 -r 590fb59de11c src/gajim.py --- a/src/gajim.py Sat Oct 08 22:48:00 2011 +0200 +++ b/src/gajim.py Sun Oct 09 00:10:22 2011 +0300 @@ -66,7 +66,8 @@ demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', - 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'command_system.implementation.standard', + 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] if os.name == 'nt':

1 0

gajim: enable execute plugin
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 051870fc9c67 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=051870fc9c67 description: enable execute plugin diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r d687f2253f17 -r 051870fc9c67 src/chat_control.py --- a/src/chat_control.py Sat Oct 08 22:28:42 2011 +0200 +++ b/src/chat_control.py Sat Oct 08 22:48:00 2011 +0200 @@ -63,6 +63,7 @@ # Here we load the module with the standard commands, so they are being detected # and dispatched. import command_system.implementation.standard +import command_system.implementation.execute try: import gtkspell

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2011