Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: reduce tab height. Fixes #5621
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 692a9ab62448 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=692a9ab62448 description: reduce tab height. Fixes #5621 diffstat: data/glade/message_window.glade | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r d3401dea7e0f -r 692a9ab62448 data/glade/message_window.glade --- a/data/glade/message_window.glade Fri Feb 26 22:42:36 2010 +0100 +++ b/data/glade/message_window.glade Fri Feb 26 22:51:42 2010 +0100 @@ -14,6 +14,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="scrollable">True</property> + <property name="tab_border">0</property> <child> <widget class="GtkVBox" id="chat_child_vbox"> <property name="can_focus">True</property> @@ -510,7 +511,6 @@ <child> <widget class="GtkImage" id="image1329"> <property name="visible">True</property> - <property name="ypad">6</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> </widget>

1 0

gajim: [Geobert] fix chat_merge_consecutive_nickname after textv...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset d3401dea7e0f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d3401dea7e0f description: [Geobert] fix chat_merge_consecutive_nickname after textview is cleared. diffstat: src/conversation_textview.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (37 lines): diff -r a607fd83d68d -r d3401dea7e0f src/conversation_textview.py --- a/src/conversation_textview.py Thu Feb 25 22:56:38 2010 +0100 +++ b/src/conversation_textview.py Fri Feb 26 22:42:36 2010 +0100 @@ -696,6 +696,8 @@ size = 2 * size - 1 self.marks_queue = Queue.Queue(size) self.focus_out_end_mark = None + self.just_cleared = True + def visit_url_from_menuitem(self, widget, link): '''basically it filters out the widget instance''' @@ -1164,6 +1166,7 @@ buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + self.just_cleared = False def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], @@ -1240,7 +1243,7 @@ text_tags.append(other_text_tag) else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): - if kind != old_kind: + if kind != old_kind or self.just_cleared: self.print_name(name, kind, other_tags_for_name) else: self.print_real_text(gajim.config.get( @@ -1263,6 +1266,7 @@ else: gobject.idle_add(self.scroll_to_end) + self.just_cleared = False buffer_.end_user_action() def get_time_to_show(self, tim):

1 0

gajim: don't remove keepalive and xmpp ping timeouts when we get...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset a607fd83d68d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a607fd83d68d description: don't remove keepalive and xmpp ping timeouts when we get an expected stanza. diffstat: src/common/xmpp/dispatcher_nb.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diffs (14 lines): diff -r c5b2c627725b -r a607fd83d68d src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Thu Feb 25 15:33:27 2010 +0100 +++ b/src/common/xmpp/dispatcher_nb.py Thu Feb 25 22:56:38 2010 +0100 @@ -462,10 +462,6 @@ # we have released dispatcher, so self._owner has no methods if not res: return - if 'remove_timeout' in self._owner.__dict__: - # When we receive data after we started disconnecting, Transport may - # already be plugged out - self._owner.remove_timeout() for (_id, _iq) in self._expected.items(): if _iq is None: # If the expected Stanza would have arrived, ProcessNonBlocking

1 0

gajim: check session and system bus before supposing dbus is wor...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset c5b2c627725b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c5b2c627725b description: check session and system bus before supposing dbus is working. Fixes #5628 diffstat: src/common/dbus_support.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 990b71a444fc -r c5b2c627725b src/common/dbus_support.py --- a/src/common/dbus_support.py Wed Feb 24 21:32:35 2010 +0100 +++ b/src/common/dbus_support.py Thu Feb 25 15:33:27 2010 +0100 @@ -42,6 +42,7 @@ else: try: # test if dbus-x11 is installed + bus = dbus.SystemBus() bus = dbus.SessionBus() supported = True # does user have D-Bus bindings? except dbus.DBusException: @@ -49,6 +50,12 @@ if not os.name == 'nt': # only say that to non Windows users print _('D-Bus does not run correctly on this machine') print _('D-Bus capabilities of Gajim cannot be used') + except exceptions.SystemBusNotPresent: + print _('D-Bus does not run correctly on this machine: system bus not ' + 'present') + except exceptions.SessionBusNotPresent: + print _('D-Bus does not run correctly on this machine: session bus not ' + 'present') class SystemBus: '''A Singleton for the DBus SystemBus'''

1 0

gajim: fix connection to openfire server using TLS. Fixes #5530
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 990b71a444fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=990b71a444fc description: fix connection to openfire server using TLS. Fixes #5530 diffstat: src/common/xmpp/tls_nb.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 659ff4104537 -r 990b71a444fc src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Wed Mar 10 22:05:11 2010 +0100 +++ b/src/common/xmpp/tls_nb.py Wed Feb 24 21:32:35 2010 +0100 @@ -339,6 +339,9 @@ tcpsock = self._owner # 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) + tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback)

1 0

gajim: Fix gstreamer device discovery
by Thibaut GIRKA 18 Mar '10

18 Mar '10

changeset 439ccdbe2561 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=439ccdbe2561 description: Fix gstreamer device discovery diffstat: src/common/multimedia_helpers.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (25 lines): diff -r f6ec2df57619 -r 439ccdbe2561 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Thu Mar 18 13:31:12 2010 +0100 +++ b/src/common/multimedia_helpers.py Thu Mar 18 14:40:00 2010 +0100 @@ -31,6 +31,7 @@ element = gst.element_factory_make(name, '%spresencetest' % name) if isinstance(element, gst.interfaces.PropertyProbe): element.set_state(gst.STATE_READY) + element.probe_property_name('device') devices = element.probe_get_values_name('device') if devices: self.devices[text % _(' Default device')] = pipe % name @@ -79,7 +80,7 @@ '%s is-live=true') # Auto src self.detect_element('autovideosrc', _('Autodetect')) - # V4L2 src ; TODO: Figure out why it doesn't work + # V4L2 src self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' @@ -96,3 +97,4 @@ # ximagesink self.detect_element('ximagesink', _('X Window System (without Xv)')) self.detect_element('autovideosink', _('Autodetect')) +

1 0

gajim: Check that there is an argument to gajim-remove handle_ur...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset f6ec2df57619 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f6ec2df57619 description: Check that there is an argument to gajim-remove handle_uri function. Fixes #5660 diffstat: src/gajim-remote.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r a7c8b26ef978 -r f6ec2df57619 src/gajim-remote.py --- a/src/gajim-remote.py Thu Mar 18 10:45:56 2010 +0200 +++ b/src/gajim-remote.py Thu Mar 18 13:31:12 2010 +0100 @@ -534,6 +534,8 @@ self.arguments += ['']*(len(args)-i) def handle_uri(self): + if len(sys.argv) < 3: + send_error(_('No uri given')) if not sys.argv[2].startswith('xmpp:'): send_error(_('Wrong uri')) sys.argv[2] = sys.argv[2][5:]

1 0

gajim: Added /gpg command and re-arranged commands scope
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset a7c8b26ef978 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7c8b26ef978 description: Added /gpg command and re-arranged commands scope diffstat: src/command_system/implementation/standard.py | 31 +++++++++++++++++++------- 1 files changed, 22 insertions(+), 9 deletions(-) diffs (58 lines): diff -r 656eed196fa8 -r a7c8b26ef978 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 18 08:32:47 2010 +0200 +++ b/src/command_system/implementation/standard.py Thu Mar 18 10:45:56 2010 +0200 @@ -157,13 +157,18 @@ for connection in gajim.connections.itervalues(): connection.change_status('online', message) -class StandardChatCommands(CommandContainer): +class StandardCommonChatCommands(CommandContainer): """ - This command container contains standard command which are unique to - a chat. + This command container contans standard commands, which are common + to a chat and a private chat only. """ - HOSTS = (ChatCommands,) + HOSTS = (ChatCommands, PrivateChatCommands) + + @command + @documentation(_("Toggle the GPG encryption")) + def gpg(self): + self._toggle_gpg() @command @documentation(_("Send a ping to the contact")) @@ -209,18 +214,26 @@ state = self._video_button.get_active() self._video_button.set_active(not state) +class StandardChatCommands(CommandContainer): + """ + This command container contains standard commands which are unique + to a chat. + """ + + HOSTS = (ChatCommands,) + class StandardPrivateChatCommands(CommandContainer): """ - This command container contains standard command which are unique to - a private chat. + This command container contains standard commands which are unique + to a private chat. """ HOSTS = (PrivateChatCommands,) -class StandardGroupchatCommands(CommandContainer): +class StandardGroupChatCommands(CommandContainer): """ - This command container contains standard command which are unique to - a group chat. + This command container contains standard commands which are unique + to a group chat. """ HOSTS = (GroupChatCommands,)

1 0

gajim: Missed some copyrights, updating
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset 656eed196fa8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=656eed196fa8 description: Missed some copyrights, updating diffstat: src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 2 +- src/command_system/framework.py | 2 +- src/command_system/mapping.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diffs (45 lines): diff -r 82611d8a9256 -r 656eed196fa8 src/command_system/__init__.py --- a/src/command_system/__init__.py Thu Mar 18 08:29:44 2010 +0200 +++ b/src/command_system/__init__.py Thu Mar 18 08:32:47 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 82611d8a9256 -r 656eed196fa8 src/command_system/dispatching.py --- a/src/command_system/dispatching.py Thu Mar 18 08:29:44 2010 +0200 +++ b/src/command_system/dispatching.py Thu Mar 18 08:32:47 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 82611d8a9256 -r 656eed196fa8 src/command_system/errors.py --- a/src/command_system/errors.py Thu Mar 18 08:29:44 2010 +0200 +++ b/src/command_system/errors.py Thu Mar 18 08:32:47 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 82611d8a9256 -r 656eed196fa8 src/command_system/framework.py --- a/src/command_system/framework.py Thu Mar 18 08:29:44 2010 +0200 +++ b/src/command_system/framework.py Thu Mar 18 08:32:47 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 82611d8a9256 -r 656eed196fa8 src/command_system/mapping.py --- a/src/command_system/mapping.py Thu Mar 18 08:29:44 2010 +0200 +++ b/src/command_system/mapping.py Thu Mar 18 08:32:47 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by

1 0

gajim: Updated copyright date in the command system
by Alexander Cherniuk 18 Mar '10

18 Mar '10

changeset 82611d8a9256 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=82611d8a9256 description: Updated copyright date in the command system diffstat: src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diffs (45 lines): diff -r 204ec09ebdc1 -r 82611d8a9256 src/command_system/implementation/__init__.py --- a/src/command_system/implementation/__init__.py Thu Mar 18 08:17:48 2010 +0200 +++ b/src/command_system/implementation/__init__.py Thu Mar 18 08:29:44 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 204ec09ebdc1 -r 82611d8a9256 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Thu Mar 18 08:17:48 2010 +0200 +++ b/src/command_system/implementation/custom.py Thu Mar 18 08:29:44 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 204ec09ebdc1 -r 82611d8a9256 src/command_system/implementation/hosts.py --- a/src/command_system/implementation/hosts.py Thu Mar 18 08:17:48 2010 +0200 +++ b/src/command_system/implementation/hosts.py Thu Mar 18 08:29:44 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 204ec09ebdc1 -r 82611d8a9256 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Thu Mar 18 08:17:48 2010 +0200 +++ b/src/command_system/implementation/middleware.py Thu Mar 18 08:29:44 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 204ec09ebdc1 -r 82611d8a9256 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 18 08:17:48 2010 +0200 +++ b/src/command_system/implementation/standard.py Thu Mar 18 08:29:44 2010 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by

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 March 2010