Commits January 2011

commits@gajim.org

2 participants
27 discussions

gajim: correct position of the window while reading the new even...
by Denis Fomin 27 Jan '11

27 Jan '11

changeset c63b9caadd5b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c63b9caadd5b description: correct position of the window while reading the new event by clicking on the tray icon (restore window coordinates when it is the maximization of the system tray) diffstat: src/statusicon.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 3af4eeae878a -r c63b9caadd5b src/statusicon.py --- a/src/statusicon.py Tue Jan 25 11:54:28 2011 +0100 +++ b/src/statusicon.py Thu Jan 27 19:10:15 2011 +0300 @@ -414,6 +414,11 @@ account, jid, event = gajim.events.get_first_systray_event() if not event: return + win = gajim.interface.roster.window + if not win.get_property('visible'): + gtkgui_helpers.move_window(win, + gajim.config.get('roster_x-position'), + gajim.config.get('roster_y-position')) gajim.interface.handle_event(account, jid, event.type_) def on_middle_click(self):

1 0

gajim: hardcode the value of OpenSSL.SSL.OP_NO_TICKET for old ve...
by Yann Leboulanger 25 Jan '11

25 Jan '11

changeset 3af4eeae878a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3af4eeae878a description: hardcode the value of OpenSSL.SSL.OP_NO_TICKET for old version of openssl. Fixes #5689 diffstat: src/common/xmpp/tls_nb.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (19 lines): diff -r b69aed0d9adc -r 3af4eeae878a src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Jan 24 09:31:54 2011 +0100 +++ b/src/common/xmpp/tls_nb.py Tue Jan 25 11:54:28 2011 +0100 @@ -384,8 +384,13 @@ else: # See http://docs.python.org/dev/library/ssl.html tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - tcpsock._sslContext.set_options(OpenSSL.SSL.OP_NO_SSLv2 | \ - OpenSSL.SSL.OP_NO_TICKET) + flags = OpenSSL.SSL.OP_NO_SSLv2 + try: + flags |= OpenSSL.SSL.OP_NO_TICKET + except AttributeError, e: + # py-OpenSSL < 0.9 or old OpenSSL + flags |= 16384 + tcpsock._sslContext.set_options(flags) tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,

1 0

gajim: add kwalletcli as optional dep in README. see #5153
by Yann Leboulanger 24 Jan '11

24 Jan '11

changeset b69aed0d9adc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b69aed0d9adc description: add kwalletcli as optional dep in README. see #5153 diffstat: README.html | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4821e8886fa1 -r b69aed0d9adc README.html --- a/README.html Sun Jan 23 11:31:29 2011 +0100 +++ b/README.html Mon Jan 24 09:31:54 2011 +0100 @@ -27,7 +27,8 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gnome-python-desktop (for GnomeKeyring support)</li> +<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li> +<li>kwalletcli (for support of KDE Wallet as password storage)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> <li>python-dbus bindings (>=0.81)</li>

1 0

gajim: use shutil.move instead of os.rename to move files. Fixes...
by Yann Leboulanger 23 Jan '11

23 Jan '11

changeset 4821e8886fa1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4821e8886fa1 description: use shutil.move instead of os.rename to move files. Fixes #6770 diffstat: src/common/check_paths.py | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diffs (73 lines): diff -r 7689773e3487 -r 4821e8886fa1 src/common/check_paths.py --- a/src/common/check_paths.py Wed Jan 19 09:08:31 2011 +0100 +++ b/src/common/check_paths.py Sun Jan 23 11:31:29 2011 +0100 @@ -24,6 +24,7 @@ ## import os +import shutil import sys import stat @@ -248,13 +249,11 @@ if not os.path.exists(src): continue print 'moving %s to %s' % (src, dst) - os.renames(src, dst) + shutil.move(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) @@ -312,11 +311,10 @@ 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 + if not os.path.exists(PLUGINS_CONFIG_PATH): + create_path(PLUGINS_CONFIG_PATH) + elif os.path.isfile(PLUGINS_CONFIG_PATH): + print _('%s is a file but it should be a directory') % PLUGINS_CONFIG_PATH print _('Gajim will now exit') sys.exit() @@ -327,6 +325,16 @@ print _('Gajim will now exit') sys.exit() + check_and_possibly_move_config() + + 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_PATH): create_cache_db() gajim.logger.attach_cache_database() @@ -335,13 +343,6 @@ print _('Gajim will now exit') sys.exit() - if not os.path.exists(PLUGINS_CONFIG_PATH): - create_path(PLUGINS_CONFIG_PATH) - elif os.path.isfile(PLUGINS_CONFIG_PATH): - print _('%s is a file but it should be a directory') % PLUGINS_CONFIG_PATH - print _('Gajim will now exit') - sys.exit() - def create_path(directory): head, tail = os.path.split(directory) if not os.path.exists(head):

1 0

gajim: add an option to allow disabling sending local time. Fixe...
by Yann Leboulanger 19 Jan '11

19 Jan '11

changeset 7689773e3487 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7689773e3487 description: add an option to allow disabling sending local time. Fixes #6764 diffstat: src/common/config.py | 3 ++- src/common/connection_handlers.py | 38 +++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) diffs (68 lines): diff -r 97a5f921882b -r 7689773e3487 src/common/config.py --- a/src/common/config.py Wed Jan 12 22:47:36 2011 +0100 +++ b/src/common/config.py Wed Jan 19 09:08:31 2011 +0100 @@ -366,7 +366,8 @@ 'subscribe_nick': [opt_bool, True], 'subscribe_location': [opt_bool, True], 'ignore_unknown_contacts': [ opt_bool, False ], - 'send_os_info': [ opt_bool, True ], + 'send_os_info': [ opt_bool, True, _("Allow Gajim to send information about the operating system you are running.") ], + 'send_time_info': [ opt_bool, True, _("Allow Gajim to send your local time.") ], 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], 'send_idle_time': [ opt_bool, True ], 'roster_version': [opt_str, ''], diff -r 97a5f921882b -r 7689773e3487 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 12 22:47:36 2011 +0100 +++ b/src/common/connection_handlers.py Wed Jan 19 09:08:31 2011 +0100 @@ -1496,12 +1496,18 @@ def _nec_time_request_received(self, obj): if obj.conn.name != self.name: return - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.getTag('query') - qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime())) - qp.setTagData('tz', helpers.decode_string(tzname[daylight])) - qp.setTagData('display', helpers.decode_string(strftime('%c', - localtime()))) + if gajim.config.get_per('accounts', self.name, 'send_time_info'): + iq_obj = obj.stanza.buildReply('result') + qp = iq_obj.getTag('query') + qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime())) + qp.setTagData('tz', helpers.decode_string(tzname[daylight])) + qp.setTagData('display', helpers.decode_string(strftime('%c', + localtime()))) + else: + iq_obj = obj.stanza.buildReply('error') + err = common.xmpp.ErrorNode(name=common.xmpp.NS_STANZAS + \ + ' service-unavailable') + iq_obj.addChild(node=err) self.connection.send(iq_obj) def _TimeRevisedCB(self, con, iq_obj): @@ -1515,13 +1521,19 @@ def _nec_time_revised_request_received(self, obj): if obj.conn.name != self.name: return - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.setTag('time', namespace=common.xmpp.NS_TIME_REVISED) - qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) - isdst = localtime().tm_isdst - zone = -(timezone, altzone)[isdst] / 60.0 - tzo = (zone / 60, abs(zone % 60)) - qp.setTagData('tzo', '%+03d:%02d' % (tzo)) + if gajim.config.get_per('accounts', self.name, 'send_time_info'): + iq_obj = obj.stanza.buildReply('result') + qp = iq_obj.setTag('time', namespace=common.xmpp.NS_TIME_REVISED) + qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) + isdst = localtime().tm_isdst + zone = -(timezone, altzone)[isdst] / 60.0 + tzo = (zone / 60, abs(zone % 60)) + qp.setTagData('tzo', '%+03d:%02d' % (tzo)) + else: + iq_obj = obj.stanza.buildReply('error') + err = common.xmpp.ErrorNode(name=common.xmpp.NS_STANZAS + \ + ' service-unavailable') + iq_obj.addChild(node=err) self.connection.send(iq_obj) def _TimeRevisedResultCB(self, con, iq_obj):

1 0

gajim: prevent Traceback when there is an empty secret file. Fix...
by Yann Leboulanger 12 Jan '11

12 Jan '11

changeset 97a5f921882b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97a5f921882b description: prevent Traceback when there is an empty secret file. Fixes #6752 diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3b31a9481a32 -r 97a5f921882b src/secrets.py --- a/src/secrets.py Wed Jan 12 06:56:28 2011 +0100 +++ b/src/secrets.py Wed Jan 12 22:47:36 2011 +0100 @@ -99,7 +99,7 @@ try: secrets = pickle.load(f) - except KeyError: + except (KeyError, EOFError): f.close() secrets = Secrets(filename)

1 0

gajim: fix offset for some timezones computation. Fixes #6749
by Yann Leboulanger 12 Jan '11

12 Jan '11

changeset 3b31a9481a32 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b31a9481a32 description: fix offset for some timezones computation. Fixes #6749 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 249a3ec50381 -r 3b31a9481a32 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jan 09 22:11:08 2011 +0100 +++ b/src/common/connection_handlers.py Wed Jan 12 06:56:28 2011 +0100 @@ -1519,7 +1519,7 @@ qp = iq_obj.setTag('time', namespace=common.xmpp.NS_TIME_REVISED) qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) isdst = localtime().tm_isdst - zone = -(timezone, altzone)[isdst] / 60 + zone = -(timezone, altzone)[isdst] / 60.0 tzo = (zone / 60, abs(zone % 60)) qp.setTagData('tzo', '%+03d:%02d' % (tzo)) self.connection.send(iq_obj)

1 0

gajim: fix initializing a variable
by Yann Leboulanger 09 Jan '11

09 Jan '11

changeset 249a3ec50381 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=249a3ec50381 description: fix initializing a variable diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 29472b5ba6e0 -r 249a3ec50381 src/common/helpers.py --- a/src/common/helpers.py Sun Jan 09 20:58:58 2011 +0100 +++ b/src/common/helpers.py Sun Jan 09 22:11:08 2011 +0100 @@ -1360,13 +1360,13 @@ def replace_dataform_media(form, stanza): import xmpp + found = False for field in form.getTags('field'): for media in field.getTags('media'): for uri in media.getTags('uri'): uri_data = uri.getData() if uri_data.startswith('cid:'): uri_data = uri_data[4:] - found = False for data in stanza.getTags('data', namespace=xmpp.NS_BOB): if data.getAttr('cid') == uri_data: uri.setData(data.getData())

1 0

gajim: prevent traceback
by Yann Leboulanger 09 Jan '11

09 Jan '11

changeset 29472b5ba6e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=29472b5ba6e0 description: prevent traceback diffstat: src/common/connection_handlers_events.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r f78ccd449879 -r 29472b5ba6e0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jan 06 21:01:43 2011 +0100 +++ b/src/common/connection_handlers_events.py Sun Jan 09 20:58:58 2011 +0100 @@ -881,7 +881,10 @@ # We may ask it to real jid in gui part. self.status_code = [] ns_muc_user_x = self.stanza.getTag('x', namespace=xmpp.NS_MUC_USER) - destroy = ns_muc_user_x.getTag('destroy') + if ns_muc_user_x: + destroy = ns_muc_user_x.getTag('destroy') + else: + destroy = None if ns_muc_user_x and destroy: # Room has been destroyed. see # http://www.xmpp.org/extensions/xep-0045.html#destroyroom

1 0

gajim-website: update windows installer link
by Yann Leboulanger 09 Jan '11

09 Jan '11

changeset 18c537d029e7 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=18c537d029e7 description: update windows installer link diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8e35622d8492 -r 18c537d029e7 downloads.php --- a/downloads.php Tue Jan 04 16:30:23 2011 +0100 +++ b/downloads.php Sun Jan 09 19:12:37 2011 +0100 @@ -143,7 +143,7 @@ print (" </h2>\n"); print ("</a>\n"); #print _("Installer for 0.14 will be available as soon as possible. Currently available:")." <a href=\"downloads/0.13/gajim-0.13.4-2.exe\">"._("Gajim 0.13.4 installer")."</a>.\n"; -print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-2.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" <br/>\n"); #print _(" Here is a")." <a href=\"downloads/0.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> ";

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2011