changeset 054e282ed59c in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=054e282ed59c description: Merge default branch into osx_newbuildsys. diffstat:

src/common/check_paths.py | 2 +- src/common/zeroconf/client_zeroconf.py | 3 ++- src/history_manager.py | 27 ++++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 9c0d6b6ab97d -r 054e282ed59c src/common/check_paths.py --- a/src/common/check_paths.py Sat May 23 02:29:10 2009 +0200 +++ b/src/common/check_paths.py Mon Jun 01 15:41:00 2009 +0200 @@ -92,7 +92,7 @@ hash TEXT, data BLOB);

- CREATE TABLE IF NOT EXISTS rooms_last_message_time( + CREATE TABLE rooms_last_message_time( jid_id INTEGER PRIMARY KEY UNIQUE, time INTEGER ); diff -r 9c0d6b6ab97d -r 054e282ed59c src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sat May 23 02:29:10 2009 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Mon Jun 01 15:41:00 2009 +0200 @@ -96,8 +96,9 @@ break P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid)

- def disconnect(self): + def disconnect(self, message=''): ''' free all resources, we are not listening anymore ''' + log.info('Disconnecting ZeroconfListener: %s' % message) gajim.idlequeue.remove_timeout(self.fd) gajim.idlequeue.unplug_idle(self.fd) self.fd = -1 diff -r 9c0d6b6ab97d -r 054e282ed59c src/history_manager.py --- a/src/history_manager.py Sat May 23 02:29:10 2009 +0200 +++ b/src/history_manager.py Mon Jun 01 15:41:00 2009 +0200 @@ -53,9 +53,34 @@ import time import locale

+import getopt from common import i18n + +def parseOpts(): + config_path = None + + try: + shortargs = 'hc:' + longargs = 'help config_path=' + opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] + except getopt.error, msg: + print str(msg) + print 'for help use --help' + sys.exit(2) + for o, a in opts: + if o in ('-h', '--help'): + print 'history_manager [--help] [--config-path]' + sys.exit() + elif o in ('-c', '--config-path'): + config_path = a + return config_path + +config_path = parseOpts() +del parseOpts + import common.configpaths -common.configpaths.gajimpaths.init() +common.configpaths.gajimpaths.init(config_path) +del config_path common.configpaths.gajimpaths.init_profile() from common import exceptions import dialogs