Commits

commits@gajim.org

17632 discussions

gajim: fix sending result iq in IBB
by Yann Leboulanger 08 Jan '12

08 Jan '12

changeset 979052d8a177 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=979052d8a177 description: fix sending result iq in IBB diffstat: src/common/protocol/bytestream.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diffs (42 lines): diff -r d699649c2c9f -r 979052d8a177 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Jan 07 14:38:59 2012 -0500 +++ b/src/common/protocol/bytestream.py Sun Jan 08 20:29:24 2012 +0100 @@ -781,8 +781,8 @@ self.StreamCloseHandler(conn, stanza) elif typ == 'result': self.SendHandler() - elif typ == 'error': - self.StreamOpenReplyHandler(conn, stanza) +# elif typ == 'error': +# self.StreamOpenReplyHandler(conn, stanza) else: conn.send(xmpp.Error(stanza, xmpp.ERR_BAD_REQUEST)) raise xmpp.NodeProcessed @@ -957,13 +957,17 @@ log.debug('StreamCloseHandler called sid->%s' % sid) # look in sending files if sid in self.files_props.keys(): - conn.send(stanza.buildReply('result')) + reply = stanza.buildReply('result') + reply.delChild('close') + conn.send(reply) gajim.socks5queue.complete_transfer_cb(self.name, self.files_props[sid]) del self.files_props[sid] # look in receiving files elif gajim.socks5queue.get_file_props(self.name, sid): file_props = gajim.socks5queue.get_file_props(self.name, sid) - conn.send(stanza.buildReply('result')) + reply = stanza.buildReply('result') + reply.delChild('close') + conn.send(reply) file_props['fp'].close() gajim.socks5queue.complete_transfer_cb(self.name, file_props) gajim.socks5queue.remove_file_props(self.name, sid) @@ -1003,6 +1007,7 @@ if stanza.getTag('data'): if self.IBBMessageHandler(conn, stanza): reply = stanza.buildReply('result') + reply.delChild('data') conn.send(reply) raise xmpp.NodeProcessed elif syn_id == self.last_sent_ibb_id:

1 0

gajim: fixes ibb transfer
by Jefry Lagrange 07 Jan '12

07 Jan '12

changeset d699649c2c9f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d699649c2c9f description: fixes ibb transfer diffstat: src/common/protocol/bytestream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d9cafd91fcfd -r d699649c2c9f src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Fri Jan 06 23:18:50 2012 -0500 +++ b/src/common/protocol/bytestream.py Sat Jan 07 14:38:59 2012 -0500 @@ -780,7 +780,7 @@ elif typ == 'set' and stanza.getTag('close', namespace=xmpp.NS_IBB): self.StreamCloseHandler(conn, stanza) elif typ == 'result': - self.StreamCommitHandler(conn, stanza) + self.SendHandler() elif typ == 'error': self.StreamOpenReplyHandler(conn, stanza) else:

1 0

gtk-win32-bin: restore previsou gtk theme
by Yann Leboulanger 07 Jan '12

07 Jan '12

changeset 960b584e0f06 in /home/hg/repos/gtk-win32-bin details:http://hg.gajim.org/gtk-win32-bin?cmd=changeset;node=960b584e0f06 description: restore previsou gtk theme diffstat: etc/gtk-2.0/gtkrc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 3f6df80835af -r 960b584e0f06 etc/gtk-2.0/gtkrc --- a/etc/gtk-2.0/gtkrc Sat Jan 07 15:06:44 2012 +0100 +++ b/etc/gtk-2.0/gtkrc Sat Jan 07 16:10:56 2012 +0100 @@ -1,4 +1,6 @@ +gtk-theme-name = "Glossy-js" # Auto-written by gtk2-prefs. Do not edit. -gtk-theme-name = "MS-Windows" - +# Windows users don't expect the PC Speaker beeping at them when they press +# backspace in an empty textview and stuff like that +gtk-error-bell = 0 \ No newline at end of file

1 0

gajim: [Pablo Mazzini] ask passphrase to user when using non-sas...
by Yann Leboulanger 07 Jan '12

07 Jan '12

changeset 7124ab1bab7c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7124ab1bab7c description: [Pablo Mazzini] ask passphrase to user when using non-sasl authentication diffstat: src/common/xmpp/auth_nb.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 30dbd467ae88 -r 7124ab1bab7c src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sat Jan 07 12:00:04 2012 +0400 +++ b/src/common/xmpp/auth_nb.py Sat Jan 07 15:41:53 2012 +0100 @@ -577,8 +577,19 @@ else: log.warn("Secure methods unsupported, performing plain text \ authentication") - query.setTagData('password', self.password) self._method = 'plain' + self._owner._caller.get_password(self._on_password, self._method) + return + resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, + func=self._on_auth) + + def _on_password(self, password): + self.password = '' if password is None else password + iq=Iq('set', NS_AUTH) + query = iq.getTag('query') + query.setTagData('username', self.user) + query.setTagData('resource', self.resource) + query.setTagData('password', self.password) resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, func=self._on_auth)

1 0

gtk-win32-bin: update to gtk 2.24.8
by Yann Leboulanger 07 Jan '12

07 Jan '12

changeset 3f6df80835af in /home/hg/repos/gtk-win32-bin details:http://hg.gajim.org/gtk-win32-bin?cmd=changeset;node=3f6df80835af description: update to gtk 2.24.8 diffstat: bin/freetype6.dll | Bin bin/iconv.dll | Bin bin/libcairo-2.dll | Bin bin/libcairo-gobject-2.dll | Bin bin/libcairo-script-interpreter-2.dll | Bin bin/libcroco-0.6-3.dll | Bin bin/libgailutil-18.dll | Bin bin/libgdk-win32-2.0-0.dll | Bin bin/libgdk_pixbuf-2.0-0.dll | Bin bin/libgio-2.0-0.dll | Bin bin/libglade-2.0-0.dll | Bin bin/libglib-2.0-0.dll | Bin bin/libgmodule-2.0-0.dll | Bin bin/libgobject-2.0-0.dll | Bin bin/libgoocanvas-3.dll | Bin bin/libgsf-1-114.dll | Bin bin/libgsf-win32-1-114.dll | Bin bin/libgthread-2.0-0.dll | Bin bin/libgtk-win32-2.0-0.dll | Bin bin/libjpeg-7.dll | Bin bin/libpango-1.0-0.dll | Bin bin/libpangocairo-1.0-0.dll | Bin bin/libpangoft2-1.0-0.dll | Bin bin/libpangowin32-1.0-0.dll | Bin bin/libpng12-0.dll | Bin bin/libpng12.dll | Bin bin/librsvg-2-2.dll | Bin bin/libtiff-3.dll | Bin bin/libxml2-2.dll | Bin bin/libxml2.dll | Bin etc/gtk-2.0/gdk-pixbuf.loaders | 30 ++++++++++---------- etc/gtk-2.0/gtk.immodules | 1 - etc/gtk-2.0/gtkrc | 8 ++--- etc/pango/pango.modules | 2 +- lib/gtk-2.0/2.10.0/engines/libpixmap.dll | Bin lib/gtk-2.0/2.10.0/engines/libwimp.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll | Bin lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll | Bin lib/gtk-2.0/modules/libgail.dll | Bin share/locale/af/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/af/LC_MESSAGES/glib20.mo | Bin share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/as/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/as/LC_MESSAGES/glib20.mo | Bin share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/az/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/be/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/be/LC_MESSAGES/gtk20.mo | Bin share/locale/be(a)latin/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/bg/LC_MESSAGES/glib20.mo | Bin share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/br/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ca/LC_MESSAGES/glib20.mo | Bin share/locale/ca(a)valencia/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ca(a)valencia/LC_MESSAGES/glib20.mo | Bin share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/cs/LC_MESSAGES/glib20.mo | Bin share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/da/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/da/LC_MESSAGES/glib20.mo | Bin share/locale/de/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/de/LC_MESSAGES/glib20.mo | Bin share/locale/de/LC_MESSAGES/gtk20.mo | Bin share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/el/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/en(a)shaw/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/en_GB/LC_MESSAGES/glib20.mo | Bin share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/es/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/es/LC_MESSAGES/glib20.mo | Bin share/locale/es/LC_MESSAGES/gtk20.mo | Bin share/locale/es/LC_MESSAGES/libgsf.mo | Bin share/locale/et/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/eu/LC_MESSAGES/glib20.mo | Bin share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/fr/LC_MESSAGES/glib20.mo | Bin share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ga/LC_MESSAGES/glib20.mo | Bin share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/gl/LC_MESSAGES/glib20.mo | Bin share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/gu/LC_MESSAGES/glib20.mo | Bin share/locale/he/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/he/LC_MESSAGES/glib20.mo | Bin share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/hi/LC_MESSAGES/glib20.mo | Bin share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/hu/LC_MESSAGES/glib20.mo | Bin share/locale/hu/LC_MESSAGES/gtk20-properties.mo | Bin share/locale/hu/LC_MESSAGES/gtk20.mo | Bin share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/id/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/id/LC_MESSAGES/glib20.mo | Bin share/locale/io/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/is/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/it/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/it/LC_MESSAGES/glib20.mo | Bin share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ja/LC_MESSAGES/glib20.mo | Bin share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ko/LC_MESSAGES/glib20.mo | Bin share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/li/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/lt/LC_MESSAGES/glib20.mo | Bin share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/lv/LC_MESSAGES/glib20.mo | Bin share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/mr/LC_MESSAGES/glib20.mo | Bin share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/my/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/nb/LC_MESSAGES/glib20.mo | Bin share/locale/nb/LC_MESSAGES/gtk20.mo | Bin share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/nl/LC_MESSAGES/glib20.mo | Bin share/locale/nl/LC_MESSAGES/gtk20.mo | Bin share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/or/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pl/LC_MESSAGES/glib20.mo | Bin share/locale/pl/LC_MESSAGES/gtk20-properties.mo | Bin share/locale/pl/LC_MESSAGES/gtk20.mo | Bin share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pt/LC_MESSAGES/glib20.mo | Bin share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/pt_BR/LC_MESSAGES/glib20.mo | Bin share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ro/LC_MESSAGES/glib20.mo | Bin share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ru/LC_MESSAGES/glib20.mo | Bin share/locale/si/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sl/LC_MESSAGES/glib20.mo | Bin share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sr/LC_MESSAGES/glib20.mo | Bin share/locale/sr(a)ije/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sr(a)latin/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sr(a)latin/LC_MESSAGES/glib20.mo | Bin share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/sv/LC_MESSAGES/glib20.mo | Bin share/locale/sv/LC_MESSAGES/libgsf.mo | Bin share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/te/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/te/LC_MESSAGES/glib20.mo | Bin share/locale/th/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/tr/LC_MESSAGES/glib20.mo | Bin share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/ug/LC_MESSAGES/glib20.mo | Bin share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/uz(a)cyrillic/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/vi/LC_MESSAGES/glib20.mo | Bin share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/zh_CN/LC_MESSAGES/glib20.mo | Bin share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/zh_HK/LC_MESSAGES/glib20.mo | Bin share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo | Bin share/locale/zh_TW/LC_MESSAGES/glib20.mo | Bin 207 files changed, 19 insertions(+), 22 deletions(-) diffs (truncated from 559 to 300 lines): diff -r 5e8b57a15fd6 -r 3f6df80835af bin/freetype6.dll Binary file bin/freetype6.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/iconv.dll Binary file bin/iconv.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libcairo-2.dll Binary file bin/libcairo-2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libcairo-gobject-2.dll Binary file bin/libcairo-gobject-2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libcairo-script-interpreter-2.dll Binary file bin/libcairo-script-interpreter-2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libcroco-0.6-3.dll Binary file bin/libcroco-0.6-3.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgailutil-18.dll Binary file bin/libgailutil-18.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgdk-win32-2.0-0.dll Binary file bin/libgdk-win32-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgdk_pixbuf-2.0-0.dll Binary file bin/libgdk_pixbuf-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgio-2.0-0.dll Binary file bin/libgio-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libglade-2.0-0.dll Binary file bin/libglade-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libglib-2.0-0.dll Binary file bin/libglib-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgmodule-2.0-0.dll Binary file bin/libgmodule-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgobject-2.0-0.dll Binary file bin/libgobject-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgoocanvas-3.dll Binary file bin/libgoocanvas-3.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgsf-1-114.dll Binary file bin/libgsf-1-114.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgsf-win32-1-114.dll Binary file bin/libgsf-win32-1-114.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgthread-2.0-0.dll Binary file bin/libgthread-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libgtk-win32-2.0-0.dll Binary file bin/libgtk-win32-2.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libjpeg-7.dll Binary file bin/libjpeg-7.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpango-1.0-0.dll Binary file bin/libpango-1.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpangocairo-1.0-0.dll Binary file bin/libpangocairo-1.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpangoft2-1.0-0.dll Binary file bin/libpangoft2-1.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpangowin32-1.0-0.dll Binary file bin/libpangowin32-1.0-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpng12-0.dll Binary file bin/libpng12-0.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libpng12.dll Binary file bin/libpng12.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/librsvg-2-2.dll Binary file bin/librsvg-2-2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libtiff-3.dll Binary file bin/libtiff-3.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libxml2-2.dll Binary file bin/libxml2-2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af bin/libxml2.dll Binary file bin/libxml2.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af etc/gtk-2.0/gdk-pixbuf.loaders --- a/etc/gtk-2.0/gdk-pixbuf.loaders Mon Dec 19 10:01:10 2011 +0100 +++ b/etc/gtk-2.0/gdk-pixbuf.loaders Sat Jan 07 15:06:44 2012 +0100 @@ -1,44 +1,44 @@ # GdkPixbuf Image Loader Modules file # # -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll" "ani" 4 "gtk20" "The ANI image format" "LGPL" "application/x-navi-animation" "" "ani" "" "RIFF ACON" " xxxx " 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" "bmp" 5 "gtk20" "The BMP image format" "LGPL" "image/bmp" "image/x-bmp" "image/x-MS-bmp" "" "bmp" "" "BM" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll" "gif" 4 "gtk20" "The GIF image format" "LGPL" "image/gif" "" "gif" "" "GIF8" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll" "icns" 4 "gtk20" "The ICNS image format" "GPL" "image/x-icns" "" "icns" "" "icns" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll" "ico" 5 "gtk20" "The ICO image format" "LGPL" "image/x-icon" "image/x-ico" "image/x-win-bitmap" "" "ico" "cur" "" " \001 " "zz znz" 100 " \002 " "zz znz" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll" "jpeg" 5 "gtk20" "The JPEG image format" "LGPL" "image/jpeg" "" "jpeg" "jpe" "jpg" "" "\377\330" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll" "pcx" 4 "gtk20" "The PCX image format" "LGPL" "image/x-pcx" "" "pcx" "" @@ -48,13 +48,13 @@ "\n\004\001" "" 100 "\n\005\001" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll" "png" 5 "gtk20" "The PNG image format" "LGPL" "image/png" "" "png" "" "\211PNG\r\n\032\n" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll" "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL" "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" "" "pnm" "pbm" "pgm" "ppm" "" @@ -65,13 +65,13 @@ "P5" "" 100 "P6" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll" "ras" 4 "gtk20" "The Sun raster image format" "LGPL" "image/x-cmu-raster" "image/x-sun-raster" "" "ras" "" "Y\246j\225" "" 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll" "tga" 4 "gtk20" "The Targa image format" "LGPL" "image/x-tga" "" "tga" "targa" "" @@ -82,7 +82,7 @@ " \n" "xz " 100 " \013" "xz " 100 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll" "tiff" 1 "gtk20" "The TIFF image format" "LGPL" "image/tiff" "" "tiff" "tif" "" @@ -90,7 +90,7 @@ "II* " " z" 100 "II* \020 CR\002 " " z zzz z" 0 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll" "wbmp" 4 "gtk20" "The WBMP image format" "LGPL" "image/vnd.wap.wbmp" "" "wbmp" "" @@ -99,14 +99,14 @@ " @" "z " 1 " " "z " 1 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll" "xbm" 4 "gtk20" "The XBM image format" "LGPL" "image/x-xbitmap" "" "xbm" "" "#define " "" 100 "/*" "" 50 -"c:/devel/target/8d7cadcb5dab920f3597c150159ff1fc/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll" +"c:/devel/target/24657c578dad0b54d4855b1780ade31a/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll" "xpm" 4 "gtk20" "The XPM image format" "LGPL" "image/x-xpixmap" "" "xpm" "" diff -r 5e8b57a15fd6 -r 3f6df80835af etc/gtk-2.0/gtk.immodules --- a/etc/gtk-2.0/gtk.immodules Mon Dec 19 10:01:10 2011 +0100 +++ b/etc/gtk-2.0/gtk.immodules Sat Jan 07 15:06:44 2012 +0100 @@ -1,4 +1,3 @@ # GTK+ Input Method Modules file # -# ModulesPath = c:\Users\tml\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\2.10.0\immodules;c:\Users\tml\.gtk-2.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\2.10.0\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\i686-pc-mingw32\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\immodules # diff -r 5e8b57a15fd6 -r 3f6df80835af etc/gtk-2.0/gtkrc --- a/etc/gtk-2.0/gtkrc Mon Dec 19 10:01:10 2011 +0100 +++ b/etc/gtk-2.0/gtkrc Sat Jan 07 15:06:44 2012 +0100 @@ -1,6 +1,4 @@ -gtk-theme-name = "Glossy-js" -# gtk-font-name = "Verdana 9" +# Auto-written by gtk2-prefs. Do not edit. -# Windows users don't expect the PC Speaker beeping at them when they press -# backspace in an empty textview and stuff like that -gtk-error-bell = 0 +gtk-theme-name = "MS-Windows" + diff -r 5e8b57a15fd6 -r 3f6df80835af etc/pango/pango.modules --- a/etc/pango/pango.modules Mon Dec 19 10:01:10 2011 +0100 +++ b/etc/pango/pango.modules Sat Jan 07 15:06:44 2012 +0100 @@ -1,5 +1,5 @@ # Pango Modules file # Automatically generated file, do not edit # -# ModulesPath = c:/devel/target/18e9007417f775a5bc83c60917e98632/lib/pango\1.6.0\modules +# ModulesPath = c:/devel/target/7ca1014c83646156ccc6c0586654cdeb/lib/pango\1.6.0\modules # diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/engines/libpixmap.dll Binary file lib/gtk-2.0/2.10.0/engines/libpixmap.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/engines/libwimp.dll Binary file lib/gtk-2.0/2.10.0/engines/libwimp.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll Binary file lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af lib/gtk-2.0/modules/libgail.dll Binary file lib/gtk-2.0/modules/libgail.dll has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/af/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/af/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/af/LC_MESSAGES/glib20.mo Binary file share/locale/af/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/as/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/as/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/as/LC_MESSAGES/glib20.mo Binary file share/locale/as/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/az/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/az/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/be/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/be/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/be/LC_MESSAGES/gtk20.mo Binary file share/locale/be/LC_MESSAGES/gtk20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/be(a)latin/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/be(a)latin/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/bg/LC_MESSAGES/glib20.mo Binary file share/locale/bg/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/br/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/br/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ca/LC_MESSAGES/glib20.mo Binary file share/locale/ca/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ca(a)valencia/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/ca(a)valencia/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/ca(a)valencia/LC_MESSAGES/glib20.mo Binary file share/locale/ca(a)valencia/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/cs/LC_MESSAGES/glib20.mo Binary file share/locale/cs/LC_MESSAGES/glib20.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo Binary file share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo has changed diff -r 5e8b57a15fd6 -r 3f6df80835af share/locale/da/LC_MESSAGES/gdk-pixbuf.mo

1 0

gajim: Prevent traceback
by Fomin Denis 07 Jan '12

07 Jan '12

changeset 30dbd467ae88 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=30dbd467ae88 description: Prevent traceback diffstat: src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r fba52fd936cc -r 30dbd467ae88 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Jan 06 09:45:11 2012 +0100 +++ b/src/plugins/pluginmanager.py Sat Jan 07 12:00:04 2012 +0400 @@ -475,7 +475,10 @@ except TypeError, type_error: # set plugin localization - module_attr._ = _ + try: + module_attr._ = _ + except AttributeError, type_error: + pass except ConfigParser.NoOptionError, type_error: # all fields are required log.debug('%s : %s' % (module_attr_name,

1 0

gajim: complete IBB jingle support, fixes #6998
by Jefry Lagrange 07 Jan '12

07 Jan '12

changeset d9cafd91fcfd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d9cafd91fcfd description: complete IBB jingle support, fixes #6998 diffstat: src/common/jingle_ft.py | 36 ++++++++++++++++++++++++++---------- src/common/jingle_transport.py | 11 ++++++----- 2 files changed, 32 insertions(+), 15 deletions(-) diffs (133 lines): diff -r d0ce81321fa1 -r d9cafd91fcfd src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Dec 29 17:22:51 2011 -0500 +++ b/src/common/jingle_ft.py Fri Jan 06 23:18:50 2012 -0500 @@ -22,7 +22,7 @@ import gajim import xmpp from jingle_content import contents, JingleContent -from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 +from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5, JingleTransportIBB, TransportType from common import helpers from common.socks5 import Socks5ReceiverClient, Socks5SenderClient from common.connection_handlers_events import FileRequestReceivedEvent @@ -61,7 +61,7 @@ self.callbacks['session-terminate'] += [self.__on_session_terminate] self.callbacks['transport-accept'] += [self.__on_transport_accept] self.callbacks['transport-replace'] += [self.__on_transport_replace] - self.callbacks['session-accept-sent'] += [self._listen_host] + self.callbacks['session-accept-sent'] += [self.__transport_setup] # fallback transport method self.callbacks['transport-reject'] += [self.__on_transport_reject] self.callbacks['transport-info'] += [self.__on_transport_info] @@ -119,10 +119,7 @@ response.delChild(response.getQuery()) con.connection.send(response) # We send the file - con.files_props[self.file_props['sid']] = self.file_props - fp = open(self.file_props['file-name'], 'r') - con.OpenStream( self.transport.sid, self.session.peerjid, - fp, blocksize=4096) + self.__start_IBB_transfer(con) raise xmpp.NodeProcessed self.file_props['streamhosts'] = self.transport.remote_candidates @@ -142,11 +139,14 @@ fingerprint = None if self.use_security: fingerprint = 'client' - gajim.socks5queue.connect_to_hosts(self.session.connection.name, + if self.transport.type == TransportType.SOCKS5: + gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, self._on_connect_error, fingerprint=fingerprint, receiving=False) - + elif self.transport.type == TransportType.IBB: + self.state = STATE_TRANSFERING + self.__start_IBB_transfer(self.session.connection) raise xmpp.NodeProcessed def __on_session_terminate(self, stanza, content, error, action): @@ -224,6 +224,7 @@ self.file_props # Listen on configured port for file transfer self._listen_host() + elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result if not self.negotiated: @@ -254,6 +255,22 @@ return # initiate transfer self.start_transfer() + + def __start_IBB_transfer(self, con): + con.files_props[self.file_props['sid']] = self.file_props + fp = open(self.file_props['file-name'], 'r') + con.OpenStream( self.transport.sid, self.session.peerjid, + fp, blocksize=4096) + + def __transport_setup(self, stanza=None, content=None, error=None + , action=None): + # Sets up a few transport specific things for the file transfer + if self.transport.type == TransportType.SOCKS5: + self._listen_host() + + if self.transport.type == TransportType.IBB: + self.state = STATE_TRANSFERING + def send_candidate_used(self, streamhost): """ @@ -328,8 +345,7 @@ # callback from socsk5queue.start_listener self.file_props['hash'] = hash_id - def _listen_host(self, stanza=None, content=None, error=None - , action=None): + def _listen_host(self): receiver = self.file_props['receiver'] sender = self.file_props['sender'] diff -r d0ce81321fa1 -r d9cafd91fcfd src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Dec 29 17:22:51 2011 -0500 +++ b/src/common/jingle_transport.py Fri Jan 06 23:18:50 2012 -0500 @@ -36,8 +36,9 @@ """ Possible types of a JingleTransport """ - datagram = 1 - streaming = 2 + ICEUDP = 1 + SOCKS5 = 2 + IBB = 3 class JingleTransport(object): @@ -98,7 +99,7 @@ Note: Don't forget to call set_file_props after initialization """ def __init__(self, node=None): - JingleTransport.__init__(self, TransportType.streaming) + JingleTransport.__init__(self, TransportType.SOCKS5) self.connection = None self.remote_candidates = [] self.sid = None @@ -300,7 +301,7 @@ def __init__(self, node=None, block_sz=None): - JingleTransport.__init__(self, TransportType.streaming) + JingleTransport.__init__(self, TransportType.IBB) if block_sz: self.block_sz = block_sz @@ -328,7 +329,7 @@ class JingleTransportICEUDP(JingleTransport): def __init__(self, node): - JingleTransport.__init__(self, TransportType.datagram) + JingleTransport.__init__(self, TransportType.ICEUDP) def make_candidate(self, candidate): types = {farsight.CANDIDATE_TYPE_HOST: 'host',

1 0

gajim: check ssl certificate against hostname only if we use sec...
by Yann Leboulanger 06 Jan '12

06 Jan '12

changeset fba52fd936cc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fba52fd936cc description: check ssl certificate against hostname only if we use secured connection. Fixes #7071 diffstat: src/common/connection.py | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diffs (42 lines): diff -r ab8fe4739898 -r fba52fd936cc src/common/connection.py --- a/src/common/connection.py Thu Jan 05 20:09:33 2012 +0100 +++ b/src/common/connection.py Fri Jan 06 09:45:11 2012 +0100 @@ -1304,24 +1304,22 @@ else: gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', self.name, - 'ignore_ssl_errors').split(): - txt = _('The authenticity of the %s certificate could be invalid.' - '\nThe certificate does not cover this domain.') % hostname - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + if not check_X509.check_certificate(con.Connection.ssl_certificate, + hostname) and '100' not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + txt = _('The authenticity of the %s certificate could be ' + 'invalid.\nThe certificate does not cover this domain.') % \ + hostname + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=txt, error_num=100, + cert=con.Connection.ssl_cert_pem, + fingerprint=con.Connection.ssl_fingerprint_sha1, + certificate=con.Connection.ssl_certificate)) + return True self._register_handlers(con, con_type) - con.auth( - user=name, - password=self.password, - resource=self.server_resource, - sasl=1, - on_auth=self.__on_auth) + con.auth(user=name, password=self.password, + resource=self.server_resource, sasl=1, on_auth=self.__on_auth) def ssl_certificate_accepted(self): if not self.connection:

1 0

gajim: make /status /away and /back commands apply to connected ...
by Yann Leboulanger 05 Jan '12

05 Jan '12

changeset ab8fe4739898 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab8fe4739898 description: make /status /away and /back commands apply to connected and synchronized accounts. Fixes #7070 diffstat: src/command_system/implementation/standard.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diffs (48 lines): diff -r 3aca86886964 -r ab8fe4739898 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Jan 05 13:50:15 2012 +0100 +++ b/src/command_system/implementation/standard.py Thu Jan 05 20:09:33 2012 +0100 @@ -125,6 +125,17 @@ self.echo(formatted) + def _get_connected_accounts(self): + conns = [] + for conn in gajim.connections.itervalues(): + if not gajim.config.get_per('accounts', conn.name, + 'sync_with_global_status'): + continue + if conn.connected <= 2: + continue + conns.append(conn) + return conns + @command(raw=True, empty=True) @doc(_(""" Set current the status @@ -135,7 +146,7 @@ def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'): raise CommandError("Invalid status given") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status(status, message) @command(raw=True, empty=True) @@ -143,7 +154,7 @@ def away(self, message): if not message: message = _("Away") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status('away', message) @command('back', raw=True, empty=True) @@ -151,7 +162,7 @@ def online(self, message): if not message: message = _("Available") - for connection in gajim.connections.itervalues(): + for connection in self._get_connected_accounts(): connection.change_status('online', message) class StandardCommonChatCommands(CommandContainer):

1 0

gajim: check in feature window if pyopenssl >= 0.12 and if pyasn...
by Yann Leboulanger 05 Jan '12

05 Jan '12

changeset 3aca86886964 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3aca86886964 description: check in feature window if pyopenssl >= 0.12 and if pyasn1 is available diffstat: src/features_window.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r a81b0b6fc583 -r 3aca86886964 src/features_window.py --- a/src/features_window.py Thu Jan 05 11:56:22 2012 +0100 +++ b/src/features_window.py Thu Jan 05 13:50:15 2012 +0100 @@ -169,6 +169,11 @@ try: import OpenSSL.SSL import OpenSSL.crypto + ver = OpenSSL.__version__ + ver_l = [int(i) for i in ver.split('.')] + if ver_l < [0, 12]: + raise ImportError + import pyasn1 except Exception: return False return True

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