Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: fix traceback
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 340e1392f599 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=340e1392f599 description: fix traceback diffstat: src/common/connection_handlers_events.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 22085f6d39e8 -r 340e1392f599 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 30 14:52:59 2011 +0200 +++ b/src/common/connection_handlers_events.py Tue Aug 30 20:39:58 2011 +0200 @@ -1016,7 +1016,8 @@ self.msgtxt = _('error while sending %(message)s ( %(error)s )'\ ) % {'message': self.msgtxt, 'error': self.stanza.getErrorMsg()} - self.stanza.delChild('html') + if self.stanza.getTag('html'): + self.stanza.delChild('html') # message from a gc without a resource self.mtype = 'groupchat'

1 0

gajim: terminate e2e sessions (from chat and private chat) when ...
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 22085f6d39e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22085f6d39e8 description: terminate e2e sessions (from chat and private chat) when we get an offline presence. Fixes #6956 diffstat: src/common/connection_handlers.py | 20 +++++++++++++++++++- src/common/stanza_session.py | 4 +++- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (69 lines): diff -r a47daf9997d5 -r 22085f6d39e8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 29 15:08:04 2011 +0200 +++ b/src/common/connection_handlers.py Tue Aug 30 14:52:59 2011 +0200 @@ -770,6 +770,8 @@ self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.register_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.register_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, @@ -780,6 +782,8 @@ self._nec_iq_error_received) gajim.ged.remove_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.remove_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.remove_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, @@ -922,10 +926,15 @@ # there won't be any sessions here if the contact terminated # their sessions before going offline (which we do) for sess in self.get_sessions(jid): - if obj.fjid != str(sess.jid): + sess_fjid = str(sess.jid) + if sess.resource: + sess_fjid += '/' + sess.resource + if obj.fjid != sess_fjid: continue if sess.control: sess.control.no_autonegotiation = False + if sess.enable_encryption: + sess.terminate_e2e() if gajim.config.get('log_contact_status_changes') and \ gajim.config.should_log(self.name, obj.jid): @@ -941,6 +950,15 @@ self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) + def _nec_gc_presence_received(self, obj): + if obj.conn.name != self.name: + return + for sess in self.get_sessions(obj.fjid): + if obj.fjid != sess.jid: + continue + if sess.enable_encryption: + sess.terminate_e2e() + def _nec_message_received(self, obj): if obj.conn.name != self.name: return diff -r a47daf9997d5 -r 22085f6d39e8 src/common/stanza_session.py --- a/src/common/stanza_session.py Mon Aug 29 15:08:04 2011 +0200 +++ b/src/common/stanza_session.py Tue Aug 30 14:52:59 2011 +0200 @@ -1148,8 +1148,10 @@ return xmpp.DataField(name=name, typ='hidden', value=dhs) def terminate_e2e(self): + self.enable_encryption = False + if self.control: + self.control.print_session_details() self.terminate() - self.enable_encryption = False def acknowledge_termination(self): StanzaSession.acknowledge_termination(self)

1 0

gajim: run plugin_downbloaded callback in the main thread instea...
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset b9ab69e17132 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b9ab69e17132 description: run plugin_downbloaded callback in the main thread instead of in Ftp Thread. Fixes freeze under windows when plugin is downloaded diffstat: plugins/plugin_installer/plugin_installer.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e8d2a188182f -r b9ab69e17132 plugins/plugin_installer/plugin_installer.py --- a/plugins/plugin_installer/plugin_installer.py Wed Aug 31 12:04:11 2011 +0200 +++ b/plugins/plugin_installer/plugin_installer.py Sun Aug 28 10:08:38 2011 +0200 @@ -432,7 +432,8 @@ print 'ERROR: cannot read file "%s"' % filename os.unlink(filename) self.ftp.quit() - self.window.emit('plugin_downloaded', self.remote_dirs) + gobject.idle_add(self.window.emit, 'plugin_downloaded', + self.remote_dirs) gobject.source_remove(self.pulse)

1 0

gajim: prevent traceback
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset a47daf9997d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a47daf9997d5 description: prevent traceback diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r b9ab69e17132 -r a47daf9997d5 src/common/connection.py --- a/src/common/connection.py Sun Aug 28 10:08:38 2011 +0200 +++ b/src/common/connection.py Mon Aug 29 15:08:04 2011 +0200 @@ -1648,6 +1648,8 @@ self._stun_servers = self._hosts = [i for i in result_array] def _request_privacy(self): + if not gajim.account_is_connected(self.name): + return iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id_ = self.connection.getAnID() iq.setID(id_)

1 0

gajim: branch for 0.15 development
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset e8d2a188182f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e8d2a188182f description: branch for 0.15 development

1 0

gajim: make gpg work under windows. Fixes #6953
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset ba91042aed08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ba91042aed08 description: make gpg work under windows. Fixes #6953 diffstat: src/common/gajim.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 84d454b02afc -r ba91042aed08 src/common/gajim.py --- a/src/common/gajim.py Tue Aug 30 21:40:54 2011 +0200 +++ b/src/common/gajim.py Wed Aug 31 11:25:47 2011 +0200 @@ -156,8 +156,12 @@ except ImportError: HAVE_GPG = False else: - from os import system - if system('gpg -h >/dev/null 2>&1'): + import os + if os.name == 'nt': + gpg_cmd = 'gpg -h >null 2>&1' + else: + gpg_cmd = 'gpg -h >/dev/null 2>&1' + if os.system(gpg_cmd): HAVE_GPG = False # Depends on use_latex option. Will be correctly set after we config options are

1 0

gajim: remove no more used patches
by Yann Leboulanger 30 Aug '11

30 Aug '11

changeset 84d454b02afc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84d454b02afc description: remove no more used patches diffstat: debian/patches/00_debian-copying.diff | 23 ----------------------- debian/patches/01_configure-ac.diff | 33 --------------------------------- debian/patches/series | 2 -- 3 files changed, 0 insertions(+), 58 deletions(-) diffs (73 lines): diff -r f72a873d64df -r 84d454b02afc debian/patches/00_debian-copying.diff --- a/debian/patches/00_debian-copying.diff Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -Description: don't install useless COPYING file -Forwarded: not-neded - ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,8 +7,6 @@ - docfilesdir = $(docdir) - docfiles_DATA = README \ - README.html \ -- ChangeLog \ -- COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS ---- a/Makefile.in -+++ b/Makefile.in -@@ -298,8 +298,6 @@ - docfilesdir = $(docdir) - docfiles_DATA = README \ - README.html \ -- ChangeLog \ -- COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS diff -r f72a873d64df -r 84d454b02afc debian/patches/01_configure-ac.diff --- a/debian/patches/01_configure-ac.diff Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev -Author: Yann Leboulanger <asterix(a)lagaule.org> -Origin: upstream,http://hg.gajim.org/gajim/diff/252bb3cf2c59/configure.ac -Last-Update: 2011-05-07 - ---- a/configure.ac -+++ b/configure.ac -@@ -36,25 +36,10 @@ - AM_NLS - - --dnl **** --dnl pygtk and gtk+ --dnl **** --PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) --AC_SUBST(PYGTK_CFLAGS) --AC_SUBST(PYGTK_LIBS) --PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFS) -- --AM_PATH_PYTHON([2.5]) --if test "x$PYTHON" = "x:"; then -- AC_MSG_ERROR([Python not found]) --fi -- - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - AC_SUBST(ACLOCAL_AMFLAGS) - --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) --AC_SUBST([PYTHON_INCLUDES]) -+AM_PATH_PYTHON([2.5]) - - dnl **** - dnl enable installation in python-2.x/site-packages/gajim diff -r f72a873d64df -r 84d454b02afc debian/patches/series --- a/debian/patches/series Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -00_debian-copying.diff -01_configure-ac.diff

1 0

gajim: fix traceback
by Yann Leboulanger 30 Aug '11

30 Aug '11

changeset f72a873d64df in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f72a873d64df description: fix traceback diffstat: src/common/connection_handlers_events.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 2d16329e4ae1 -r f72a873d64df src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 30 18:29:10 2011 +0300 +++ b/src/common/connection_handlers_events.py Tue Aug 30 20:39:58 2011 +0200 @@ -1005,7 +1005,8 @@ self.msgtxt = _('error while sending %(message)s ( %(error)s )'\ ) % {'message': self.msgtxt, 'error': self.stanza.getErrorMsg()} - self.stanza.delChild('html') + if self.stanza.getTag('html'): + self.stanza.delChild('html') # message from a gc without a resource self.mtype = 'groupchat'

1 0

gajim: Plugin Installer. translation fix
by Fomin Denis 30 Aug '11

30 Aug '11

changeset 2d16329e4ae1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d16329e4ae1 description: Plugin Installer. translation fix diffstat: plugins/plugin_installer/plugin_installer.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 3caa97afda7a -r 2d16329e4ae1 plugins/plugin_installer/plugin_installer.py --- a/plugins/plugin_installer/plugin_installer.py Tue Aug 30 18:17:46 2011 +0300 +++ b/plugins/plugin_installer/plugin_installer.py Tue Aug 30 18:29:10 2011 +0300 @@ -441,6 +441,7 @@ self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( 'config_dialog.ui') self.xml = gtk.Builder() + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['hbox111']) hbox = self.xml.get_object('hbox111') self.child.pack_start(hbox)

1 0

gajim: merge
by Fomin Denis 30 Aug '11

30 Aug '11

changeset 3caa97afda7a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3caa97afda7a description: merge diffstat: src/common/connection_handlers.py | 20 +++++++++++++++++++- src/common/stanza_session.py | 4 +++- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (69 lines): diff -r 4cd4c8a80d49 -r 3caa97afda7a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 30 16:22:03 2011 +0300 +++ b/src/common/connection_handlers.py Tue Aug 30 18:17:46 2011 +0300 @@ -770,6 +770,8 @@ self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.register_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.register_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, @@ -780,6 +782,8 @@ self._nec_iq_error_received) gajim.ged.remove_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.remove_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.remove_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, @@ -921,10 +925,15 @@ # there won't be any sessions here if the contact terminated # their sessions before going offline (which we do) for sess in self.get_sessions(jid): - if obj.fjid != str(sess.jid): + sess_fjid = str(sess.jid) + if sess.resource: + sess_fjid += '/' + sess.resource + if obj.fjid != sess_fjid: continue if sess.control: sess.control.no_autonegotiation = False + if sess.enable_encryption: + sess.terminate_e2e() if gajim.config.get('log_contact_status_changes') and \ gajim.config.should_log(self.name, obj.jid): @@ -940,6 +949,15 @@ self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) + def _nec_gc_presence_received(self, obj): + if obj.conn.name != self.name: + return + for sess in self.get_sessions(obj.fjid): + if obj.fjid != sess.jid: + continue + if sess.enable_encryption: + sess.terminate_e2e() + def _nec_message_received(self, obj): if obj.conn.name != self.name: return diff -r 4cd4c8a80d49 -r 3caa97afda7a src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Aug 30 16:22:03 2011 +0300 +++ b/src/common/stanza_session.py Tue Aug 30 18:17:46 2011 +0300 @@ -1148,8 +1148,10 @@ return xmpp.DataField(name=name, typ='hidden', value=dhs) def terminate_e2e(self): + self.enable_encryption = False + if self.control: + self.control.print_session_details() self.terminate() - self.enable_encryption = False def acknowledge_termination(self): StanzaSession.acknowledge_termination(self)

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011